]> git.sesse.net Git - ffmpeg/commitdiff
idroqdec: fix leaking pkt on failure
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Mon, 28 Nov 2016 23:43:27 +0000 (00:43 +0100)
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Tue, 29 Nov 2016 23:22:45 +0000 (00:22 +0100)
The code calls av_new_packet a few lines above and the allocated memory
has to be freed in case of an error.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
libavformat/idroqdec.c

index 83701b59c52d0e9f31f6d679833ca810d1cf79e5..8fd67a6818b37c0c0742bb57e3603100948b41a0 100644 (file)
@@ -222,8 +222,10 @@ static int roq_read_packet(AVFormatContext *s,
             pkt->pos= avio_tell(pb);
             ret = avio_read(pb, pkt->data + RoQ_CHUNK_PREAMBLE_SIZE,
                 chunk_size);
-            if (ret != chunk_size)
+            if (ret != chunk_size) {
+                av_packet_unref(pkt);
                 ret = AVERROR(EIO);
+            }
 
             packet_read = 1;
             break;