[FFmpeg-cvslog] r21938 - trunk/libavformat/idcin.c

[Måns Rullgård]

vitor <subversion at mplayerhq.hu> writes:

> Author: vitor
> Date: Sun Feb 21 15:41:39 2010
> New Revision: 21938
>
> Log:
> Fix memory leak for truncated packets in idCin demuxer
>
> Modified:
>    trunk/libavformat/idcin.c
>
> Modified: trunk/libavformat/idcin.c
> ==============================================================================
> --- trunk/libavformat/idcin.c	Sun Feb 21 14:28:46 2010	(r21937)
> +++ trunk/libavformat/idcin.c	Sun Feb 21 15:41:39 2010	(r21938)
> @@ -260,8 +260,8 @@ static int idcin_read_packet(AVFormatCon
>          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(AVFormatCon
>          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;

Can you please verify the new output in the FATE test.

-- 
M?ns Rullg?rd
mans at mansr.com