diff options
| author | Steve Murphy <murf@digium.com> | 2008-03-18 14:09:50 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2008-03-18 14:09:50 +0000 |
| commit | 4e29ae880698bd1c5d3bd36bb1ee5f74f64ff803 (patch) | |
| tree | 58c8202a302c0d8d8fba33c9967bc826f6ecd589 /utils/ael_main.c | |
| parent | 0de4eba6402ece75a72b0d6d90c004e3d5568189 (diff) | |
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
Diffstat (limited to 'utils/ael_main.c')
| -rw-r--r-- | utils/ael_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/ael_main.c b/utils/ael_main.c index 24349b457..74a432fa9 100644 --- a/utils/ael_main.c +++ b/utils/ael_main.c @@ -97,7 +97,7 @@ int ast_add_extension2(struct ast_context *con, const char *registrar); void pbx_builtin_setvar(void *chan, void *data); struct ast_context * ast_context_create(void **extcontexts, const char *name, const char *registrar); -struct ast_context * ast_context_find_or_create(void **extcontexts, const char *name, const char *registrar); +struct ast_context * ast_context_find_or_create(void **extcontexts, void *tab, const char *name, const char *registrar); void ast_context_add_ignorepat2(struct ast_context *con, const char *value, const char *registrar); void ast_context_add_include2(struct ast_context *con, const char *value, const char *registrar); void ast_context_add_switch2(struct ast_context *con, const char *value, const char *data, int eval, const char *registrar); @@ -361,7 +361,7 @@ struct ast_context * ast_context_create(void **extcontexts, const char *name, co return x; } -struct ast_context * ast_context_find_or_create(void **extcontexts, const char *name, const char *registrar) +struct ast_context * ast_context_find_or_create(void **extcontexts, void *tab, const char *name, const char *registrar) { struct ast_context *x = calloc(1, sizeof(*x)); if (!x) |