From: Automerge Script <automerge@asterisk.org>
Date: Fri, 13 Jul 2007 21:29:00 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.22-netsec~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8872e642520dd29603ced17c8385a6c1f4655475;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index f4e3a81677..64fcc8e27f 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -1052,7 +1052,7 @@ static int load_moh_classes(int reload)
 				class = moh_class_malloc();
 				if (!class) {
 					ast_log(LOG_WARNING, "Out of memory!\n");
-					return numclasses;
+					break;
 				}
 				
 				ast_copy_string(class->name, var->name, sizeof(class->name));
@@ -1080,7 +1080,7 @@ static int load_moh_classes(int reload)
 			class = moh_class_malloc();
 			if (!class) {
 				ast_log(LOG_WARNING, "Out of memory!\n");
-				return numclasses;
+				break;
 			}
 			
 			ast_copy_string(class->name, var->name, sizeof(class->name));