From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 13 Jul 2007 20:36:16 +0000 (+0000)
Subject: Merged revisions 75107 via svnmerge from
X-Git-Tag: 1.4.8~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa44ffb5c3bf212fe0b20bf3fb51a9f0c8ebcc99;p=thirdparty%2Fasterisk.git

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

........
r75107 | russell | 2007-07-13 15:35:22 -0500 (Fri, 13 Jul 2007) | 3 lines

Fix a couple potential minor memory leaks.  load_moh_classes() could return
without destroying the loaded configuration.

........


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

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 9227016782..86b25a1825 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -1065,7 +1065,7 @@ static int load_moh_classes(int reload)
 				*args++ = '\0';
 			if (!(get_mohbyname(var->name, 0))) {			
 				if (!(class = moh_class_malloc())) {
-					return numclasses;
+					break;
 				}
 				
 				ast_copy_string(class->name, var->name, sizeof(class->name));
@@ -1091,7 +1091,7 @@ static int load_moh_classes(int reload)
 			if (args)
 				*args++ = '\0';			
 			if (!(class = moh_class_malloc())) {
-				return numclasses;
+				break;
 			}
 			
 			ast_copy_string(class->name, var->name, sizeof(class->name));