diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-09 02:42:48 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-09 02:42:48 +0000 |
commit | 150a8ca7e0ac5bba0ce84f558de607940d5a8e28 (patch) | |
tree | 7b13858f37d9632bb040a8e0eea7a37aaa2ddd9e /channels/chan_local.c | |
parent | b3c12310c9524198548fa37ecd916e2e5c83c828 (diff) |
Merged revisions 60846 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r60846 | tilghman | 2007-04-08 21:37:18 -0500 (Sun, 08 Apr 2007) | 2 lines
Bug 9505 - If the return value for local_queue_frame is set, then p->lock is no longer valid.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@60847 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_local.c')
-rw-r--r-- | channels/chan_local.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index df573390a..d6752ceb5 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -214,7 +214,8 @@ static int local_answer(struct ast_channel *ast) res = local_queue_frame(p, isoutbound, &answer, ast); } else ast_log(LOG_WARNING, "Huh? Local is being asked to answer?\n"); - ast_mutex_unlock(&p->lock); + if (!res) + ast_mutex_unlock(&p->lock); return res; } @@ -294,7 +295,8 @@ static int local_write(struct ast_channel *ast, struct ast_frame *f) ast_log(LOG_DEBUG, "Not posting to queue since already masked on '%s'\n", ast->name); res = 0; } - ast_mutex_unlock(&p->lock); + if (!res) + ast_mutex_unlock(&p->lock); return res; } @@ -342,8 +344,8 @@ static int local_indicate(struct ast_channel *ast, int condition, const void *da f.subclass = condition; f.data = (void*)data; f.datalen = datalen; - res = local_queue_frame(p, isoutbound, &f, ast); - ast_mutex_unlock(&p->lock); + if (!(res = local_queue_frame(p, isoutbound, &f, ast))) + ast_mutex_unlock(&p->lock); } return res; @@ -362,8 +364,8 @@ static int local_digit_begin(struct ast_channel *ast, char digit) ast_mutex_lock(&p->lock); isoutbound = IS_OUTBOUND(ast, p); f.subclass = digit; - res = local_queue_frame(p, isoutbound, &f, ast); - ast_mutex_unlock(&p->lock); + if (!(res = local_queue_frame(p, isoutbound, &f, ast))) + ast_mutex_unlock(&p->lock); return res; } @@ -382,9 +384,9 @@ static int local_digit_end(struct ast_channel *ast, char digit, unsigned int dur isoutbound = IS_OUTBOUND(ast, p); f.subclass = digit; f.len = duration; - res = local_queue_frame(p, isoutbound, &f, ast); - ast_mutex_unlock(&p->lock); - + if (!(res = local_queue_frame(p, isoutbound, &f, ast))) + ast_mutex_unlock(&p->lock); + return res; } @@ -402,8 +404,8 @@ static int local_sendtext(struct ast_channel *ast, const char *text) isoutbound = IS_OUTBOUND(ast, p); f.data = (char *) text; f.datalen = strlen(text) + 1; - res = local_queue_frame(p, isoutbound, &f, ast); - ast_mutex_unlock(&p->lock); + if (!(res = local_queue_frame(p, isoutbound, &f, ast))) + ast_mutex_unlock(&p->lock); return res; } @@ -422,8 +424,8 @@ static int local_sendhtml(struct ast_channel *ast, int subclass, const char *dat f.subclass = subclass; f.data = (char *)data; f.datalen = datalen; - res = local_queue_frame(p, isoutbound, &f, ast); - ast_mutex_unlock(&p->lock); + if (!(res = local_queue_frame(p, isoutbound, &f, ast))) + ast_mutex_unlock(&p->lock); return res; } @@ -477,7 +479,7 @@ static int local_hangup(struct ast_channel *ast) int isoutbound; struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_HANGUP }; struct ast_channel *ochan = NULL; - int glaredetect = 0; + int glaredetect = 0, res = 0; if (!p) return -1; @@ -524,8 +526,9 @@ static int local_hangup(struct ast_channel *ast) /* Need to actually hangup since there is no PBX */ ochan = p->chan; else - local_queue_frame(p, isoutbound, &f, NULL); - ast_mutex_unlock(&p->lock); + res = local_queue_frame(p, isoutbound, &f, NULL); + if (!res) + ast_mutex_unlock(&p->lock); if (ochan) ast_hangup(ochan); return 0; |