diff options
| author | Jonathan Rose <jrose@digium.com> | 2011-12-07 20:34:23 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2011-12-07 20:34:23 +0000 |
| commit | 8e94432d9a336cd48d61b59ef720b32c6d0a9cd1 (patch) | |
| tree | 0e95d896efb7c38c4d3c5a763fe2def11dafb588 /apps/app_meetme.c | |
| parent | 980ab2d018086aa7663b190a4361440a39462bdd (diff) | |
Fix: Meetme recording variables from realtime DB use null entries over channel variables
Meetme would attempt to substitute the realtime values of RECORDING_FILE and
RECORDING_FORMAT from the meetme db entry instead of using the channel variable set
for those variables in spite of those database entries being NULL or even lacking
a column to represent them.
(closes issue ASTERISK-18873)
Reported by: Byron Clark
Patches:
ASTERISK-18873-1.patch uploaded by Byron Clark (license 6157)
........
Merged revisions 347369 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 347383 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@347395 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 008341441..6421f3b98 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -4043,8 +4043,12 @@ static struct ast_conference *find_conf_realtime(struct ast_channel *chan, char cnf->useropts = ast_strdup(useropts); cnf->adminopts = ast_strdup(adminopts); cnf->bookid = ast_strdup(bookid); - cnf->recordingfilename = ast_strdup(recordingfilename); - cnf->recordingformat = ast_strdup(recordingformat); + if (!ast_strlen_zero(recordingfilename)) { + cnf->recordingfilename = ast_strdup(recordingfilename); + } + if (!ast_strlen_zero(recordingformat)) { + cnf->recordingformat = ast_strdup(recordingformat); + } /* Parse the other options into confflags -- need to do this in two * steps, because the parse_options routine zeroes the buffer. */ |