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 /res/res_monitor.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 'res/res_monitor.c')
| -rw-r--r-- | res/res_monitor.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/res/res_monitor.c b/res/res_monitor.c index 61dc4a2d0..9dac05177 100644 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -684,9 +684,13 @@ static int start_monitor_exec(struct ast_channel *chan, const char *data) if (urlprefix) { snprintf(tmp, sizeof(tmp), "%s/%s.%s", urlprefix, args.fname_base, ((strcmp(args.format, "gsm")) ? "wav" : "gsm")); - if (!chan->cdr && !(chan->cdr = ast_cdr_alloc())) + ast_channel_lock(chan); + if (!chan->cdr && !(chan->cdr = ast_cdr_alloc())) { + ast_channel_unlock(chan); return -1; + } ast_cdr_setuserfield(chan, tmp); + ast_channel_unlock(chan); } if (waitforbridge) { /* We must remove the "b" option if listed. In principle none of |