diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2011-12-16 21:10:19 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2011-12-16 21:10:19 +0000 |
| commit | b05d4603c4506bae4a065409937fa7567df9bc9f (patch) | |
| tree | b38e1b54c4e4d447a650211787e351a4d26835f5 /main/pbx.c | |
| parent | 8baea2b35e96d1c51756c00aff322a4e1af858a0 (diff) | |
Fix crash during CDR update.
The ast_cdr_setcid() and ast_cdr_update() were shown in ASTERISK-18836 to
be called by different threads for the same channel. The channel driver
thread and the PBX thread running dialplan.
* Add lock protection around CDR API calls that access an ast_channel
pointer.
(closes issue ASTERISK-18836)
Reported by: gpluser
Review: https://reviewboard.asterisk.org/r/1628/
........
Merged revisions 348362 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 348363 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@348364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/pbx.c')
| -rw-r--r-- | main/pbx.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index fc4b3d93a..3ae294fcc 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -5112,10 +5112,12 @@ static enum ast_pbx_result __ast_pbx_run(struct ast_channel *c, set_ext_pri(c, "s", 1); } + ast_channel_lock(c); if (c->cdr) { /* allow CDR variables that have been collected after channel was created to be visible during call */ ast_cdr_update(c); } + ast_channel_unlock(c); for (;;) { char dst_exten[256]; /* buffer to accumulate digits */ int pos = 0; /* XXX should check bounds */ @@ -5222,8 +5224,11 @@ static enum ast_pbx_result __ast_pbx_run(struct ast_channel *c, } /* Call timed out with no special extension to jump to. */ } - if (c->cdr) + ast_channel_lock(c); + if (c->cdr) { ast_cdr_update(c); + } + ast_channel_unlock(c); error = 1; break; } @@ -5327,10 +5332,12 @@ static enum ast_pbx_result __ast_pbx_run(struct ast_channel *c, } } } + ast_channel_lock(c); if (c->cdr) { ast_verb(2, "CDR updated on %s\n",c->name); ast_cdr_update(c); } + ast_channel_unlock(c); } } @@ -9571,7 +9578,9 @@ static int pbx_builtin_resetcdr(struct ast_channel *chan, const char *data) static int pbx_builtin_setamaflags(struct ast_channel *chan, const char *data) { /* Copy the AMA Flags as specified */ + ast_channel_lock(chan); ast_cdr_setamaflags(chan, data ? data : ""); + ast_channel_unlock(chan); return 0; } |