[FFmpeg-devel] [PATCH] riffdec: error out on negative bit rate

Andreas Cadhalpun andreas.cadhalpun at googlemail.com
Sat Jul 11 01:26:23 CEST 2015


On 11.07.2015 00:49, Michael Niedermayer wrote:
> On Sat, Jul 11, 2015 at 12:39:09AM +0200, Andreas Cadhalpun wrote:
>> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
>> ---
>>  libavformat/riffdec.c | 5 +++++
>>  1 file changed, 5 insertions(+)
>>
>> diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
>> index eebd8ed..be55699 100644
>> --- a/libavformat/riffdec.c
>> +++ b/libavformat/riffdec.c
>> @@ -106,6 +106,11 @@ int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size, int big_
>>          codec->bit_rate    = avio_rb32(pb) * 8;
>>          codec->block_align = avio_rb16(pb);
>>      }
>> +    if (codec->bit_rate < 0) {
>> +        av_log(NULL, AV_LOG_ERROR,
>> +               "Invalid bit rate: %d\n", codec->bit_rate);
>> +        return AVERROR_INVALIDDATA;
>> +    }
> 
> i think it might be better to just warn on a invalid bitrate and only
> error out if AV_EF_EXPLODE is set
> because erroring out from header reading coul end all
> further decoding of that stream (which might in principle be fine
> otherwise)

Makes sense, new patch attached.
Note however that the explode mode doesn't necessarily work, because e.g.
the avi demuxer doesn't set err_recognition for the AVCodecContext.

Best regards,
Andreas



-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-riffdec-prevent-negative-bit-rate.patch
Type: text/x-diff
Size: 1133 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150711/4540c5e4/attachment.patch>


More information about the ffmpeg-devel mailing list