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 9227016782f4b687b5893361d76b6be9653cd2c5..86b25a1825194d6dff8f0f9376d6485c96e9258c 100644 (file)
--- 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));