[FFmpeg-devel] [PATCH] Fixes bug https://trac.ffmpeg.org/ticket/6700.

[Pablo Montilla]

Sorry, this is my first patch, so I'm learning how it's done. I'm new to git, and work on Windows, so everything is against me! 😉

I did not check all the count uses...the compiler didn't barf, so I thought it was a harmless change (I understand unsigned vs signed is not so small a change, but one can only hope). 

I'll do the check and repost the patch with proper messages (if that is good with you).

Thank you,
Pablo

-----Original Message-----
From: ffmpeg-devel [mailto:ffmpeg-devel-bounces at ffmpeg.org] On Behalf Of wm4
Sent: Thursday, September 28, 2017 12:25 PM
To: ffmpeg-devel at ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH] Fixes bug https://trac.ffmpeg.org/ticket/6700.

On Thu, 28 Sep 2017 12:11:48 -0300
Pablo Montilla <melkor at odyssey.com.uy> wrote:

> ---
>  libavformat/isom.h | 2 +-
>  libavformat/mov.c  | 6 +-----
>  2 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/libavformat/isom.h b/libavformat/isom.h index 
> fdd98c28f5..a32b92ccdd 100644
> --- a/libavformat/isom.h
> +++ b/libavformat/isom.h
> @@ -52,7 +52,7 @@ struct AVAESCTR;
>   */
>  
>  typedef struct MOVStts {
> -    int count;
> +    unsigned int count;
>      int duration;
>  } MOVStts;
>  
> diff --git a/libavformat/mov.c b/libavformat/mov.c index 
> 2de60b2159..9cfc860c18 100644
> --- a/libavformat/mov.c
> +++ b/libavformat/mov.c
> @@ -2658,15 +2658,11 @@ static int mov_read_stts(MOVContext *c, 
> AVIOContext *pb, MOVAtom atom)
>  
>      for (i = 0; i < entries && !pb->eof_reached; i++) {
>          int sample_duration;
> -        int sample_count;
> +        unsigned int sample_count;
>  
>          sample_count=avio_rb32(pb);
>          sample_duration = avio_rb32(pb);
>  
> -        if (sample_count < 0) {
> -            av_log(c->fc, AV_LOG_ERROR, "Invalid sample_count=%d\n", sample_count);
> -            return AVERROR_INVALIDDATA;
> -        }
>          sc->stts_data[i].count= sample_count;
>          sc->stts_data[i].duration= sample_duration;
>  

Needs a complete description of the issue on the commit message. The ticket number is rather useless. The commit message subject line should follow the usual project conventions.

Regarding the actual change, did you check all users of the .count field?
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel at ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel