From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Sat, 3 Mar 2007 06:46:24 +0000 (+0000)
Subject: Merged revisions 57649 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3068
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7839f111a0e8775cfca9235387ede8eeecfdf5ca;p=thirdparty%2Fasterisk.git

Merged revisions 57649 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r57649 | tilghman | 2007-03-03 00:45:00 -0600 (Sat, 03 Mar 2007) | 10 lines

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

........
r57648 | tilghman | 2007-03-03 00:36:55 -0600 (Sat, 03 Mar 2007) | 2 lines

Memory leak of a list, if call recording was abandoned

........

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


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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 5cb03c86ae..c6d126bcfa 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -4219,6 +4219,10 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
 			}	
 		}
 	}
+
+	/* If anything failed above, we still have this list to free */
+	while ((vmtmp = AST_LIST_REMOVE_HEAD(&extensions, list)))
+		free_user(vmtmp);
 	return res ? res : cmd;
 }