mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-29 07:24:55 +00:00
Making sure a char ptr is initialized before we strchr on it is a GOOD thing. Ya! Testing!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30194 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -2389,14 +2389,15 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
|
|||||||
ast_log(LOG_WARNING, "monitor-format (in queues.conf) and MONITOR_FILENAME cannot contain a '|'! Not recording.\n");
|
ast_log(LOG_WARNING, "monitor-format (in queues.conf) and MONITOR_FILENAME cannot contain a '|'! Not recording.\n");
|
||||||
mixmonapp = NULL;
|
mixmonapp = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!monitor_options)
|
||||||
|
monitor_options = ast_strdupa("");
|
||||||
|
|
||||||
if (strchr(monitor_options, '|')) {
|
if (strchr(monitor_options, '|')) {
|
||||||
ast_log(LOG_WARNING, "MONITOR_OPTIONS cannot contain a '|'! Not recording.\n");
|
ast_log(LOG_WARNING, "MONITOR_OPTIONS cannot contain a '|'! Not recording.\n");
|
||||||
mixmonapp = NULL;
|
mixmonapp = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!monitor_options)
|
|
||||||
monitor_options = ast_strdupa("");
|
|
||||||
|
|
||||||
if (mixmonapp) {
|
if (mixmonapp) {
|
||||||
if (!ast_strlen_zero(monitor_exec) && !ast_strlen_zero(monitor_options))
|
if (!ast_strlen_zero(monitor_exec) && !ast_strlen_zero(monitor_options))
|
||||||
|
|||||||
Reference in New Issue
Block a user