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

Merge "app_queue: fix ring_entry to access nativeformats with a channel lock" into 16

This commit is contained in:
Kevin Harwell 2019-03-13 11:17:40 -05:00 committed by Gerrit Code Review
parent 0e053fe4e3 e7dd4bd4a9
commit 19957fc60e
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/app_queue.c
View File

@ -4497,6 +4497,7 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies
char tech[256];
char *location;
const char *macrocontext, *macroexten;
struct ast_format_cap *nativeformats;
RAII_VAR(struct ast_json *, blob, NULL, ast_json_unref);
/* on entry here, we know that tmp->chan == NULL */
@ -4513,8 +4514,13 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies
location = "";
}
ast_channel_lock(qe->chan);
nativeformats = ao2_bump(ast_channel_nativeformats(qe->chan));
ast_channel_unlock(qe->chan);
/* Request the peer */
tmp->chan = ast_request(tech, ast_channel_nativeformats(qe->chan), NULL, qe->chan, location, &status);
tmp->chan = ast_request(tech, nativeformats, NULL, qe->chan, location, &status);
ao2_cleanup(nativeformats);
if (!tmp->chan) { /* If we can't, just go on to the next call */
ao2_lock(qe->parent);
qe->parent->rrpos++;