[asterisk-commits] file: trunk r90102 - in /trunk: ./ apps/app_queue.c res/res_musiconhold.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed Nov 28 17:03:09 2007
New Revision: 90102

URL: http://svn.digium.com/view/asterisk?view=rev&rev=90102
Log:
Merged revisions 90101 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r90101 | file | 2007-11-28 18:59:28 -0400 (Wed, 28 Nov 2007) | 6 lines

Fix a few memory leaks.
(closes issue #11405)
Reported by: eliel
Patches:
      load_realtime.patch uploaded by eliel (license 64)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c
    trunk/res/res_musiconhold.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?view=diff&rev=90102&r1=90101&r2=90102
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Wed Nov 28 17:03:09 2007
@@ -1362,6 +1362,7 @@
 			member_config = ast_load_realtime_multientry("queue_members", "interface LIKE", "%", "queue_name", queuename, NULL);
 			if (!member_config) {
 				ast_log(LOG_ERROR, "no queue_members defined in your config (extconfig.conf).\n");
+				ast_variables_destroy(queue_vars);
 				return NULL;
 			}
 		}

Modified: trunk/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=90102&r1=90101&r2=90102
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Wed Nov 28 17:03:09 2007
@@ -1108,6 +1108,7 @@
 					}
 				}
 			}
+			ast_variables_destroy(var);
 			if (ast_strlen_zero(mohclass->dir)) {
 				if (!strcasecmp(mohclass->mode, "custom")) {
 					strcpy(mohclass->dir, "nodir");
@@ -1206,7 +1207,8 @@
 
 			}
 
-		}
+		} else if (var)
+			ast_variables_destroy(var);
 	}