kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip: Fail global load if debug or default_from_user are empty

Browse Source 
If debug was specified in the global configuration but left blank,
the logger would treat it as a wildcard and log all hosts.  If
default_from_user was empty, a crash would result.

The global apply handler now checks for empty strings.

ASTERISK-26239 #close
ASTERISK-26238 #close

Change-Id: Ie75727f5cd5808845d92cc81f5713842fb203336
This commit is contained in:
George Joseph
2016-08-11 11:18:15 -06:00
parent e845ef6762
commit aeb859dba9
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/res_pjsip/config_global.c
View File

@@ -118,6 +118,18 @@ static int global_apply(const struct ast_sorcery *sorcery, void *obj)
struct global_config *cfg = obj;
char max_forwards[10];
if (ast_strlen_zero(cfg->debug)) {
ast_log(LOG_ERROR,
"Global option 'debug' can't be empty. Set it to a valid value or remove the entry to accept 'no' as the default\n");
return -1;
}
if (ast_strlen_zero(cfg->default_from_user)) {
ast_log(LOG_ERROR,
"Global option 'default_from_user' can't be empty. Set it to a valid value or remove the entry to accept 'asterisk' as the default\n");
return -1;
}
snprintf(max_forwards, sizeof(max_forwards), "%u", cfg->max_forwards);
ast_sip_add_global_request_header("Max-Forwards", max_forwards, 1);