kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@33812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-06-13 05:04:22 +00:00
parent e7648cca42
commit 279b842888
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/app_festival.c
View File

@@ -472,6 +472,9 @@ static int festival_exec(struct ast_channel *chan, void *vdata)
if ( read_data == -1 )
{
ast_log(LOG_WARNING,"Unable to read from cache/festival fd");
close(fd);
ast_config_destroy(cfg);
LOCAL_USER_REMOVE(u);
return -1;
}
n += read_data;

12
apps/app_voicemail.c
View File

@@ -6172,10 +6172,14 @@ static int load_config(void)
} else {
ast_log(LOG_WARNING, "Out of memory while reading voicemail config\n");
free(z);
ast_mutex_unlock(&vmlock);
ast_config_destroy(cfg);
return -1;
}
} else {
ast_log(LOG_WARNING, "Out of memory while reading voicemail config\n");
ast_mutex_unlock(&vmlock);
ast_config_destroy(cfg);
return -1;
}
var = var->next;
@@ -6435,8 +6439,10 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s
return 0;
}
if (!(origtime = ast_variable_retrieve(msg_cfg, "message", "origtime")))
if (!(origtime = ast_variable_retrieve(msg_cfg, "message", "origtime"))) {
ast_config_destroy(msg_cfg);
return 0;
}
cid = ast_variable_retrieve(msg_cfg, "message", "callerid");
@@ -6444,6 +6450,8 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s
if (!strncasecmp("macro",context,5)) /* Macro names in contexts are useless for our needs */
context = ast_variable_retrieve(msg_cfg, "message","macrocontext");
ast_config_destroy(msg_cfg);
if (option == 3) {
if (!res)
@@ -6576,8 +6584,6 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s
}
}
ast_config_destroy(msg_cfg);
if (!res) {
make_file(vms->fn, sizeof(vms->fn), vms->curdir, msg);
vms->heard[msg] = 1;