mirror of
https://github.com/asterisk/asterisk.git
synced 2026-07-23 16:05:30 -07:00
Merged revisions 69944 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r69944 | russell | 2007-06-19 10:22:36 -0500 (Tue, 19 Jun 2007) | 10 lines Fix a crash that could occur when handing device state changes. When the state of a device changes, the device state thread tells the extension state handling code that it changed. Then, the extension state code calls the callback in chan_sip so that it can update subscriptions to that extension. A pointer to a sip_pvt structure is passed to this function as the call which needs a NOTIFY sent. However, there was no locking done to ensure that the pvt struct didn't disappear during this process. (issue #9946, reported by tdonahue, patch by me, patch updated to trunk to use the sip_pvt lock wrappers by eliel) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69945 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -8824,6 +8824,8 @@ static int cb_extensionstate(char *context, char* exten, int state, void *data)
|
||||
{
|
||||
struct sip_pvt *p = data;
|
||||
|
||||
sip_pvt_lock(p);
|
||||
|
||||
switch(state) {
|
||||
case AST_EXTENSION_DEACTIVATED: /* Retry after a while */
|
||||
case AST_EXTENSION_REMOVED: /* Extension is gone */
|
||||
@@ -8844,6 +8846,9 @@ static int cb_extensionstate(char *context, char* exten, int state, void *data)
|
||||
|
||||
if (option_verbose > 1)
|
||||
ast_verbose(VERBOSE_PREFIX_1 "Extension Changed %s new state %s for Notify User %s\n", exten, ast_extension_state2str(state), p->username);
|
||||
|
||||
sip_pvt_unlock(p);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user