]> git.ipfire.org Git - thirdparty/asterisk.git/commit
pbx.c: fix confused match caller id that deleted exten still in hash
authorScott Griepentrog <sgriepentrog@digium.com>
Fri, 25 Oct 2013 20:47:55 +0000 (20:47 +0000)
committerScott Griepentrog <sgriepentrog@digium.com>
Fri, 25 Oct 2013 20:47:55 +0000 (20:47 +0000)
commit1de75f4faee4243ee41101279bcfa0e73b2b6a10
treead1c14a205d86b34a7690d66f97c39ea2a7b41cf
parent155ba34659c0d2aef859b9634cabad8397963ed8
pbx.c: fix confused match caller id that deleted exten still in hash

This fixes a bug where a zero length callerid match adjacent to a no
match callerid extension entry would be deleted together, which then
resulted in hashtable references to free'd memory.  A third state of
the matchcid value has been added to indicate match to any extension
which allows enforcing comparison of matchcid on/off without errors.

(closes issue AST-1235)
Reported by: Guenther Kelleter
Review: https://reviewboard.asterisk.org/r/2930/
........

Merged revisions 401959 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 401960 from http://svn.asterisk.org/svn/asterisk/branches/11

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@401961 65c4cc65-6c06-0410-ace0-fbb531ad65f3
include/asterisk/pbx.h
main/pbx.c