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

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

23
apps/app_voicemail.c
View File

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