kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 07:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't die on a bad voicemail conf timezone entry (bug #1326)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2591 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-03-31 18:59:42 +00:00
parent 71e80e5f62
commit 4b02c78aaa
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/app_voicemail.c
View File

@@ -3422,6 +3422,7 @@ static int load_config(void)
msg_format = ast_strdupa(var->value); msg_format = ast_strdupa(var->value);
if (msg_format != NULL) { if (msg_format != NULL) {
timezone = strsep(&msg_format, "|"); timezone = strsep(&msg_format, "|");
if (msg_format) {
strncpy(z->name, var->name, sizeof(z->name) - 1); strncpy(z->name, var->name, sizeof(z->name) - 1);
strncpy(z->timezone, timezone, sizeof(z->timezone) - 1); strncpy(z->timezone, timezone, sizeof(z->timezone) - 1);
strncpy(z->msg_format, msg_format, sizeof(z->msg_format) - 1); strncpy(z->msg_format, msg_format, sizeof(z->msg_format) - 1);
@@ -3433,6 +3434,10 @@ static int load_config(void)
zones = z; zones = z;
zonesl = z; zonesl = z;
} }
} else {
ast_log(LOG_WARNING, "Invalid tonezone definition at line %d\n", var->lineno);
free(z);
}
} else { } else {
ast_log(LOG_WARNING, "Out of memory while reading voicemail config\n"); ast_log(LOG_WARNING, "Out of memory while reading voicemail config\n");
free(z); free(z);