sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chan_local: Fix local_pvt ref leak in local_devicestate(). 

Regression introduced by ASTERISK-20390 fix.

(closes issue ASTERISK-20769)
Reported by: rmudgett
Tested by: rmudgett
........

Merged revisions 376868 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 376869 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 376870 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@376871 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett 2012-11-29 23:01:16 +00:00
parent 53e97bc9ee
commit 9a8ce96aff
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
channels/chan_local.c
View File

@ -311,15 +311,20 @@ static int local_devicestate(const char *data)
res = AST_DEVICE_NOT_INUSE; res = AST_DEVICE_NOT_INUSE;
it = ao2_iterator_init(locals, 0); it = ao2_iterator_init(locals, 0);
while ((lp = ao2_iterator_next(&it)) && (res == AST_DEVICE_NOT_INUSE)) { for (; (lp = ao2_iterator_next(&it)); ao2_ref(lp, -1)) {
if (!strcmp(exten, lp->exten) && !strcmp(context, lp->context) && lp->owner) { int is_inuse;
ao2_lock(lp);
if (ast_test_flag(lp, LOCAL_LAUNCHED_PBX)) { ao2_lock(lp);
res = AST_DEVICE_INUSE; is_inuse = !strcmp(exten, lp->exten)
} && !strcmp(context, lp->context)
ao2_unlock(lp); && lp->owner
&& ast_test_flag(lp, LOCAL_LAUNCHED_PBX);
ao2_unlock(lp);
if (is_inuse) {
res = AST_DEVICE_INUSE;
ao2_ref(lp, -1);
break;
} }
ao2_ref(lp, -1);
} }
ao2_iterator_destroy(&it); ao2_iterator_destroy(&it);