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

Fix locking in zapscan

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3251 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-06-21 04:08:54 +00:00
parent ef4d9eb5b7
commit bbe5ff18c2
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_zapscan.c
View File

@@ -72,10 +72,7 @@ static struct ast_channel *get_zap_channel_locked(int num) {
ast_mutex_unlock(&c->lock); ast_mutex_unlock(&c->lock);
c = ast_channel_walk_locked(c); c = ast_channel_walk_locked(c);
} }
if (c)
return c; return c;
return NULL;
} }
static int careful_write(int fd, unsigned char *data, int len) static int careful_write(int fd, unsigned char *data, int len)
@@ -334,7 +331,8 @@ static int conf_exec(struct ast_channel *chan, void *data)
res = conf_run(chan, confno, confflags); res = conf_run(chan, confno, confflags);
if (res<0) break; if (res<0) break;
input = res; input = res;
} } else if (tempchan)
ast_mutex_unlock(&tempchan->lock);
lastchan = tempchan; lastchan = tempchan;
} }
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);