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 f4e3a81677b399ab1e6e1fe4ddd6caa4b5ceeb40..64fcc8e27f65badcc8f82dcd808c15c8866a1114 100644 (file)
--- 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));