mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-18 18:58:22 +00:00
Fix locking in zapscan
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3251 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -72,10 +72,7 @@ static struct ast_channel *get_zap_channel_locked(int num) {
|
||||
ast_mutex_unlock(&c->lock);
|
||||
c = ast_channel_walk_locked(c);
|
||||
}
|
||||
if (c)
|
||||
return c;
|
||||
|
||||
return NULL;
|
||||
return c;
|
||||
}
|
||||
|
||||
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);
|
||||
if (res<0) break;
|
||||
input = res;
|
||||
}
|
||||
} else if (tempchan)
|
||||
ast_mutex_unlock(&tempchan->lock);
|
||||
lastchan = tempchan;
|
||||
}
|
||||
LOCAL_USER_REMOVE(u);
|
||||
|
Reference in New Issue
Block a user