kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-21 09:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 48377 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r48377 | file | 2006-12-10 23:57:38 -0500 (Sun, 10 Dec 2006) | 2 lines

Don't access the conference structure after it has been freed.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2006-12-11 05:01:37 +00:00
parent d670858735
commit f5c2b80787
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/app_meetme.c
View File

@@ -1945,6 +1945,13 @@ bailoutandtrynormal:
conf->markedusers--; conf->markedusers--;
/* Remove ourselves from the list */ /* Remove ourselves from the list */
AST_LIST_REMOVE(&conf->userlist, user, list); AST_LIST_REMOVE(&conf->userlist, user, list);
/* Change any states */
if (!conf->users)
ast_device_state_changed("meetme:%s", conf->confno);
if (confflags & (CONFFLAG_SLA_STATION|CONFFLAG_SLA_TRUNK))
st_device_state_changed("SLA:%s", conf->confno + 4);
if (AST_LIST_EMPTY(&conf->userlist)) { if (AST_LIST_EMPTY(&conf->userlist)) {
/* close this one when no more users and no references*/ /* close this one when no more users and no references*/
if (!conf->refcount) if (!conf->refcount)
@@ -1953,12 +1960,6 @@ bailoutandtrynormal:
/* Return the number of seconds the user was in the conf */ /* Return the number of seconds the user was in the conf */
snprintf(meetmesecs, sizeof(meetmesecs), "%d", (int) (time(NULL) - user->jointime)); snprintf(meetmesecs, sizeof(meetmesecs), "%d", (int) (time(NULL) - user->jointime));
pbx_builtin_setvar_helper(chan, "MEETMESECS", meetmesecs); pbx_builtin_setvar_helper(chan, "MEETMESECS", meetmesecs);
/* This device changed state now */
if (!conf->users) /* If there are no more members */
ast_device_state_changed("meetme:%s", conf->confno);
if (confflags & (CONFFLAG_SLA_STATION|CONFFLAG_SLA_TRUNK))
ast_device_state_changed("SLA:%s", conf->confno + 4);
} }
free(user); free(user);
AST_LIST_UNLOCK(&confs); AST_LIST_UNLOCK(&confs);