mp3: properly forward mp_decode_frame errors
authorLuca Barbato <lu_zero@gentoo.org>
Mon, 22 Oct 2012 17:11:05 +0000 (19:11 +0200)
committerReinhard Tartler <siretart@tauware.de>
Sat, 5 Jan 2013 10:49:25 +0000 (11:49 +0100)
commita5290800f5716a50ff53761164955be09a4e5581
tree0b4b473595985201bc987bacb36ae8f53f96dff0
parent56c1e18a5225f2737f91e6028f114f56d7ca802a
mp3: properly forward mp_decode_frame errors

The function can return either a parsing error or a memory management
error.

Fixes: CVE-2012-2797
(cherry picked from commit 9ab0874ea8b6774c6f5470dba2b5b4615a610d0d)

Conflicts:

libavcodec/mpegaudiodec.c

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
libavcodec/mpegaudiodec.c