Merged revisions 71751 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r71751 | tilghman | 2007-06-26 07:27:47 -0500 (Tue, 26 Jun 2007) | 10 lines

Merged revisions 71750 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r71750 | tilghman | 2007-06-26 07:25:58 -0500 (Tue, 26 Jun 2007) | 2 lines

Issue 10062 - Trying to move a message without selecting one first results in memory corruption

........

................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71752 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 04396de2cfcbde9c9cb655cb17d94e15b5daeb12..e183c0a2e7954d2acc3dffc79e34c11e61474b8e 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -6902,6 +6902,11 @@ static int vm_execmain(struct ast_channel *chan, void *data)
                                cmd = ast_play_and_wait(chan, "vm-nomore");
                        break;
                case '9':
+                       if (vms.curmsg < 0 || vms.curmsg > vms.lastmsg) {
+                               /* No message selected */
+                               cmd = 0;
+                               break;
+                       }
                        if (useadsi)
                                adsi_folders(chan, 1, "Save to folder...");
                        cmd = get_folder2(chan, "vm-savefolder", 1);