From: Joshua Colp <jcolp@digium.com>
Date: Wed, 28 Nov 2007 23:03:09 +0000 (+0000)
Subject: Merged revisions 90101 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~607
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48da9102252c3271ac6e20018603f19dbba959de;p=thirdparty%2Fasterisk.git

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)

........


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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index b24200c5e7..274ae30018 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1362,6 +1362,7 @@ static struct call_queue *load_realtime_queue(const char *queuename)
 			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;
 			}
 		}
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index 027aed0236..985dc80b30 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -1108,6 +1108,7 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
 					}
 				}
 			}
+			ast_variables_destroy(var);
 			if (ast_strlen_zero(mohclass->dir)) {
 				if (!strcasecmp(mohclass->mode, "custom")) {
 					strcpy(mohclass->dir, "nodir");
@@ -1206,7 +1207,8 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
 
 			}
 
-		}
+		} else if (var)
+			ast_variables_destroy(var);
 	}