automerge commit

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 993e4df1371e0ffdcd58a30481841831e50e6954..98bb8b96e3ec9c60535d8aa9ffaf5d4efe9823d0 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -3626,6 +3626,7 @@ static int forward_message(struct ast_channel *chan, char *context, char *dir, i
                                vmtmp = vmtmp->next;
                                free_user(vmfree);
                        }
+                       extensions = NULL;
                        if (saved_messages > 0) {
                                /* give confirmation that the message was saved */
                                /* commented out since we can't forward batches yet
@@ -3639,6 +3640,13 @@ static int forward_message(struct ast_channel *chan, char *context, char *dir, i
                        }       
                }
        }
+
+       /* If anything failed above, we still have this list to free */
+       while (extensions) {
+               vmfree = extensions;
+               extensions = extensions->next;
+               free_user(vmfree);
+       }
        return res ? res : cmd;
 }