[FFmpeg-cvslog] avformat/iff: fix memleak of packet

Michael Niedermayer git at videolan.org
Sun Dec 15 03:26:02 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 15 01:32:48 2013 +0100| [6f9be9106382083b2268ddb3599fbf49abb36f6b] | committer: Michael Niedermayer

avformat/iff: fix memleak of packet

Fixes: msan_uninit-mem_7f65b9788da6_388_24.iff
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/iff.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/iff.c b/libavformat/iff.c
index 03c4b08..b5751c5 100644
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -462,7 +462,9 @@ static int iff_read_packet(AVFormatContext *s,
         buf = pkt->data;
         bytestream_put_be16(&buf, 2);
         ret = avio_read(pb, buf, iff->body_size);
-        if (ret>=0 && ret < iff->body_size)
+        if (ret<0) {
+            av_free_packet(pkt);
+        } else if (ret < iff->body_size)
             av_shrink_packet(pkt, ret + 2);
     } else {
         av_assert0(0);



More information about the ffmpeg-cvslog mailing list