From 4e29ae880698bd1c5d3bd36bb1ee5f74f64ff803 Mon Sep 17 00:00:00 2001 From: Steve Murphy Date: Tue, 18 Mar 2008 14:09:50 +0000 Subject: Merged revisions 109309 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r109309 | murf | 2008-03-18 00:37:15 -0600 (Tue, 18 Mar 2008) | 17 lines (closes issue #11903) Reported by: atis Many thanks to atis for spotting this problem and reporting it. The fix was to straighten out how items are placed on and removed from the file stack. Regressions as well as the provided test case helped to straighten out all code paths. valgrind was used to make sure all memory allocated was freed. Sorry for not solving this earlier. I got distracted. Added the ntest23 regression test, which is mainly a copy of ntest22, but with a few juicy errors thrown in, to replicate the kind of error that atis spotted. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@109357 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- utils/conf2ael.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'utils/conf2ael.c') diff --git a/utils/conf2ael.c b/utils/conf2ael.c index 56856efbf..c69486a33 100644 --- a/utils/conf2ael.c +++ b/utils/conf2ael.c @@ -610,7 +610,7 @@ struct ast_context *ast_context_find_or_create(struct ast_context **extcontexts, { printf("find/Creating context %s, registrar=%s\n", name, registrar); - return localized_context_create(extcontexts, name, registrar); + return localized_context_find_or_create(extcontexts, exttable, name, registrar); } void ast_cli_register_multiple(void); @@ -657,7 +657,7 @@ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_ void ast_merge_contexts_and_delete(struct ast_context **extcontexts, struct ast_hashtab *exttable, const char *registrar) { - localized_merge_contexts_and_delete(extcontexts, registrar); + localized_merge_contexts_and_delete(extcontexts, exttable, registrar); } struct ast_exten *pbx_find_extension(struct ast_channel *chan, -- cgit v1.2.3