kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 10:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Meetme recording variables from realtime DB use null entries over channel variables

Browse Source 
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)



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@347369 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jonathan Rose
2011-12-07 20:23:57 +00:00
parent dc8125726e
commit 547aec88fb
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/app_meetme.c
View File

@@ -3927,8 +3927,12 @@ static struct ast_conference *find_conf_realtime(struct ast_channel *chan, char
cnf->useropts = ast_strdup(useropts); cnf->useropts = ast_strdup(useropts);
cnf->adminopts = ast_strdup(adminopts); cnf->adminopts = ast_strdup(adminopts);
cnf->bookid = ast_strdup(bookid); cnf->bookid = ast_strdup(bookid);
cnf->recordingfilename = ast_strdup(recordingfilename); if (!ast_strlen_zero(recordingfilename)) {
cnf->recordingformat = ast_strdup(recordingformat); 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 /* Parse the other options into confflags -- need to do this in two
* steps, because the parse_options routine zeroes the buffer. */ * steps, because the parse_options routine zeroes the buffer. */