Merged revisions 304638 via svnmerge from
authorSean Bright <sean@malleable.com>
Fri, 28 Jan 2011 20:19:57 +0000 (20:19 +0000)
committerSean Bright <sean@malleable.com>
Fri, 28 Jan 2011 20:19:57 +0000 (20:19 +0000)
commit64dfc6e73571e46737652be219f0bb0d5b83b4ea
tree89e7917bccdb858c35de9f3932966f82817133a2
parent475f4be06f9a9cc7335b9b4d2915327630b53671
Merged revisions 304638 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r304638 | seanbright | 2011-01-28 15:19:08 -0500 (Fri, 28 Jan 2011) | 11 lines

  Restore some conditionals that we lost in r277814.

  There are some cases where ast_append_ha() is called with a NULL instead of a
  valid int pointer.  So if we get a NULL, don't try to dereference it.

  (closes issue #18162)
  Reported by: imcdona
  Patches:
        issue0018162.patch uploaded by pabelanger (license 224)
  Tested by: enegaard
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@304639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/acl.c