Merged revisions 109309 via svnmerge from
authorSteve Murphy <murf@digium.com>
Tue, 18 Mar 2008 14:09:50 +0000 (14:09 +0000)
committerSteve Murphy <murf@digium.com>
Tue, 18 Mar 2008 14:09:50 +0000 (14:09 +0000)
commit4e29ae880698bd1c5d3bd36bb1ee5f74f64ff803
tree58c8202a302c0d8d8fba33c9967bc826f6ecd589
parent0de4eba6402ece75a72b0d6d90c004e3d5568189
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
19 files changed:
include/asterisk/extconf.h
pbx/ael/ael-test/ael-ntest23/extensions.ael [new file with mode: 0644]
pbx/ael/ael-test/ael-ntest23/qq.ael [new file with mode: 0644]
pbx/ael/ael-test/ael-ntest23/t1/a.ael [new file with mode: 0644]
pbx/ael/ael-test/ael-ntest23/t1/b.ael [new file with mode: 0644]
pbx/ael/ael-test/ael-ntest23/t1/c.ael [new file with mode: 0644]
pbx/ael/ael-test/ael-ntest23/t2/d.ael [new file with mode: 0644]
pbx/ael/ael-test/ael-ntest23/t2/e.ael [new file with mode: 0644]
pbx/ael/ael-test/ael-ntest23/t2/f.ael [new file with mode: 0644]
pbx/ael/ael-test/ael-ntest23/t3/g.ael [new file with mode: 0644]
pbx/ael/ael-test/ael-ntest23/t3/h.ael [new file with mode: 0644]
pbx/ael/ael-test/ael-ntest23/t3/i.ael [new file with mode: 0644]
pbx/ael/ael-test/ael-ntest23/t3/j.ael [new file with mode: 0644]
pbx/ael/ael-test/ref.ael-ntest23 [new file with mode: 0644]
res/ael/ael.flex
res/ael/ael_lex.c
utils/ael_main.c
utils/conf2ael.c
utils/extconf.c