From ee263ee87e6379aaf7cf64d41c5e58c3aa20c030 Mon Sep 17 00:00:00 2001 From: Automerge script Date: Thu, 13 Apr 2006 21:06:44 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@19929 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_voicemail.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index b925a9746e..70a27f6726 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -5497,7 +5497,7 @@ static int vm_exec(struct ast_channel *chan, void *data) { int res = 0; struct localuser *u; - char tmp[256]; + char *tmp; struct leave_vm_options leave_options; int argc; char *argv[2]; @@ -5512,7 +5512,12 @@ static int vm_exec(struct ast_channel *chan, void *data) ast_answer(chan); if (!ast_strlen_zero(data)) { - ast_copy_string(tmp, data, sizeof(tmp)); + tmp = ast_strdupa((char *)data); + if (!tmp) { + ast_log(LOG_ERROR, "Out of memory\n"); + LOCAL_USER_REMOVE(u); + return -1; + } argc = ast_app_separate_args(tmp, '|', argv, sizeof(argv) / sizeof(argv[0])); if (argc == 2) { if (ast_app_parse_options(vm_app_options, &flags, opts, argv[1])) { @@ -5551,6 +5556,7 @@ static int vm_exec(struct ast_channel *chan, void *data) } } } else { + char tmp[256]; res = ast_app_getdata(chan, "vm-whichbox", tmp, sizeof(tmp) - 1, 0); if (res < 0) { LOCAL_USER_REMOVE(u); -- 2.47.2