automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43255 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 1672144e8724f12c0e6b3a45ee5a71bce5ce48b6..1bd79709cee9513b9cfd90d1e1ffd1eecdcea419 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -3841,7 +3841,7 @@ static int play_message(struct ast_channel *chan, struct ast_vm_user *vmu, struc
                return 0;
        }
 
-       cid = ast_variable_retrieve(msg_cfg, "message", "callerid");
+       cid = ast_strdupa(ast_variable_retrieve(msg_cfg, "message", "callerid"));
        duration = ast_variable_retrieve(msg_cfg, "message", "duration");
        category = ast_variable_retrieve(msg_cfg, "message", "category");
 
@@ -6462,7 +6462,7 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s
                return 0;
        }
 
-       cid = ast_variable_retrieve(msg_cfg, "message", "callerid");
+       cid = ast_strdupa(ast_variable_retrieve(msg_cfg, "message", "callerid"));
 
        context = ast_variable_retrieve(msg_cfg, "message", "context");
        if (!strncasecmp("macro",context,5)) /* Macro names in contexts are useless for our needs */