diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2012-10-22 19:11:05 +0200 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2013-01-05 11:49:25 +0100 |
commit | a5290800f5716a50ff53761164955be09a4e5581 (patch) | |
tree | 0b4b473595985201bc987bacb36ae8f53f96dff0 /libavcodec/mpeg12enc.c | |
parent | 56c1e18a5225f2737f91e6028f114f56d7ca802a (diff) | |
download | ffmpeg-a5290800f5716a50ff53761164955be09a4e5581.tar.gz |
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>
Diffstat (limited to 'libavcodec/mpeg12enc.c')
0 files changed, 0 insertions, 0 deletions