From e05fd35dc6fc40ccd885f62e730806f8d9aaac1a Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Fri, 21 Nov 2008 23:15:58 +0000 Subject: [PATCH] Merged revisions 158602 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r158602 | tilghman | 2008-11-21 17:14:11 -0600 (Fri, 21 Nov 2008) | 12 lines Merged revisions 158600 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r158600 | tilghman | 2008-11-21 17:07:46 -0600 (Fri, 21 Nov 2008) | 5 lines The passed extension may not be the same in the list as the current entry, because we strip spaces when copying the extension into the structure. Therefore, use the copied item to place the item into the list. (found by lmadsen on -dev, fixed by me) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@158604 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/pbx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/pbx.c b/main/pbx.c index a1ba568f81..34771d1ead 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -7009,7 +7009,7 @@ int ast_add_extension2(struct ast_context *con, } res = 0; /* some compilers will think it is uninitialized otherwise */ for (e = con->root; e; el = e, e = e->next) { /* scan the extension list */ - res = ext_cmp(e->exten, extension); + res = ext_cmp(e->exten, tmp->exten); if (res == 0) { /* extension match, now look at cidmatch */ if (!e->matchcid && !tmp->matchcid) res = 0;