[SCM] libav/experimental: Fix memory leak for truncated packets in idCin demuxer

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:00:50 UTC 2013


The following commit has been merged in the experimental branch:
commit 044a950d8230c881c7e6833f9999498784f3fc76
Author: Vitor Sessak <vitor1001 at gmail.com>
Date:   Sun Feb 21 14:41:39 2010 +0000

    Fix memory leak for truncated packets in idCin demuxer
    
    Originally committed as revision 21938 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/idcin.c b/libavformat/idcin.c
index 8e9dfb5..9fd146f 100644
--- a/libavformat/idcin.c
+++ b/libavformat/idcin.c
@@ -260,8 +260,8 @@ static int idcin_read_packet(AVFormatContext *s,
         url_fseek(pb, 4, SEEK_CUR);
         chunk_size -= 4;
         ret= av_get_packet(pb, pkt, chunk_size);
-        if (ret != chunk_size)
-            return AVERROR(EIO);
+        if (ret < 0)
+            return ret;
         pkt->stream_index = idcin->video_stream_index;
         pkt->pts = idcin->pts;
     } else {
@@ -271,8 +271,8 @@ static int idcin_read_packet(AVFormatContext *s,
         else
             chunk_size = idcin->audio_chunk_size1;
         ret= av_get_packet(pb, pkt, chunk_size);
-        if (ret != chunk_size)
-            return AVERROR(EIO);
+        if (ret < 0)
+            return ret;
         pkt->stream_index = idcin->audio_stream_index;
         pkt->pts = idcin->pts;
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list