[FFmpeg-devel] [libav-devel] [PATCH] nuv: reject negative fps rate
Andreas Cadhalpun
andreas.cadhalpun at googlemail.com
Sun Dec 20 12:29:22 CET 2015
On 18.12.2015 16:41, Andreas Cadhalpun wrote:
> Subject: [PATCH] nuv: sanitize negative fps rate
>
> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> ---
> libavformat/nuv.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/libavformat/nuv.c b/libavformat/nuv.c
> index 2a1b70f..c30da60 100644
> --- a/libavformat/nuv.c
> +++ b/libavformat/nuv.c
> @@ -172,6 +172,15 @@ static int nuv_header(AVFormatContext *s)
> if (aspect > 0.9999 && aspect < 1.0001)
> aspect = 4.0 / 3.0;
> fps = av_int2double(avio_rl64(pb));
> + if (fps < 0.0f) {
> + if (s->error_recognition & AV_EF_EXPLODE) {
> + av_log(s, AV_LOG_ERROR, "Invalid frame rate %f\n", fps);
> + return AVERROR_INVALIDDATA;
> + } else {
> + av_log(s, AV_LOG_WARNING, "Invalid frame rate %f, setting to 0.\n", fps);
> + fps = 0.0f;
> + }
> + }
>
> // number of packets per stream type, -1 means unknown, e.g. streaming
> v_packs = avio_rl32(pb);
I've pushed this version now.
Best regards,
Andreas
More information about the ffmpeg-devel
mailing list