From: Mark Michelson <mmichelson@digium.com>
Date: Fri, 30 Jan 2015 16:55:39 +0000 (+0000)
Subject: Backport memory leak fix in pbx.c from branch 13 revision 431468
X-Git-Tag: 11.16.0-rc1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10135560425f795db53f2f280a9e81a5a9998096;p=thirdparty%2Fasterisk.git

Backport memory leak fix in pbx.c from branch 13 revision 431468



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

diff --git a/main/pbx.c b/main/pbx.c
index 71ae6dad31..783716f8e2 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -8878,7 +8878,7 @@ static void context_merge(struct ast_context **extcontexts, struct ast_hashtab *
 				dupdstr = ast_strdup(prio_item->data);
 
 				res1 = ast_add_extension2(new, 0, prio_item->exten, prio_item->priority, prio_item->label,
-										  prio_item->matchcid ? prio_item->cidmatch : NULL, prio_item->app, dupdstr, prio_item->datad, prio_item->registrar);
+										  prio_item->matchcid ? prio_item->cidmatch : NULL, prio_item->app, dupdstr, ast_free_ptr, prio_item->registrar);
 				if (!res1 && new_exten_item && new_prio_item){
 					ast_verb(3,"Dropping old dialplan item %s/%s/%d [%s(%s)] (registrar=%s) due to conflict with new dialplan\n",
 							context->name, prio_item->exten, prio_item->priority, prio_item->app, (char*)prio_item->data, prio_item->registrar);