[FFmpeg-cvslog] avformat/aacdec: Fix leak in adts_aac_read_packet()

Michael Niedermayer git at videolan.org
Fri Dec 8 11:35:19 EET 2017


ffmpeg | branch: release/3.4 | Michael Niedermayer <michael at niedermayer.cc> | Sat Nov 25 19:22:51 2017 +0100| [3ae71b648ad041cacd10db5be220eb2aeda2869b] | committer: Michael Niedermayer

avformat/aacdec: Fix leak in adts_aac_read_packet()

Fixes: chromium-773637/clusterfuzz-testcase-minimized-6418078673141760

Found-by: ossfuzz/chromium
Reviewed-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 2779d33ed99898675e0b3884fabe1ce6839f36d1)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ae71b648ad041cacd10db5be220eb2aeda2869b
---

 libavformat/aacdec.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c
index 364b33404f..36d558ff54 100644
--- a/libavformat/aacdec.c
+++ b/libavformat/aacdec.c
@@ -139,7 +139,11 @@ static int adts_aac_read_packet(AVFormatContext *s, AVPacket *pkt)
         return AVERROR_INVALIDDATA;
     }
 
-    return av_append_packet(s->pb, pkt, fsize - ADTS_HEADER_SIZE);
+    ret = av_append_packet(s->pb, pkt, fsize - ADTS_HEADER_SIZE);
+    if (ret < 0)
+        av_packet_unref(pkt);
+
+    return ret;
 }
 
 AVInputFormat ff_aac_demuxer = {



More information about the ffmpeg-cvslog mailing list