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 71ae6dad312643c477826a7b06978b26dd50a272..783716f8e24e0f96d0da8996d35d8db8982f36a6 100644 (file)
--- 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);