]> git.ipfire.org Git - thirdparty/asterisk.git/commit
Merged revisions 260050 via svnmerge from
authorDavid Vossel <dvossel@digium.com>
Thu, 29 Apr 2010 15:35:38 +0000 (15:35 +0000)
committerDavid Vossel <dvossel@digium.com>
Thu, 29 Apr 2010 15:35:38 +0000 (15:35 +0000)
commit4b4569810ab40b5253ed10f8c778646693771ba1
tree3a4e066b59fa4c20ed015116babeec18bc2bf974
parentdab73774269c328583e9db68bccfdc01ccca611d
Merged revisions 260050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r260050 | dvossel | 2010-04-29 10:33:27 -0500 (Thu, 29 Apr 2010) | 21 lines

  Merged revisions 260049 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r260049 | dvossel | 2010-04-29 10:31:02 -0500 (Thu, 29 Apr 2010) | 14 lines

    Fixes crash in audiohook_write_list

    The middle_frame in the audiohook_write_list function was
    being freed if a audiohook manipulator returned a failure.
    This is incorrect logic.  This patch resolves this and
    adds detailed descriptions of how this function should work
    and why manipulator failures must be ignored.

    (closes issue #17052)
    Reported by: dvossel
    Tested by: dvossel

    (closes issue #16196)
    Reported by: atis

    Review: https://reviewboard.asterisk.org/r/623/
  ........
................

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