summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-02-14 20:01:35 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2022-03-28 22:18:10 +0200
commita8744292982217c9183c616b06c1a4ab9acb223f (patch)
tree895039275d09e6c5dff143242e938efec3d9d32f
parentd1234b92b3e4d746e14c79652e54b44efd3ab964 (diff)
downloadffmpeg-a8744292982217c9183c616b06c1a4ab9acb223f.tar.gz
avformat/matroskadec: Check duration
Fixes: -nan is outside the range of representable values of type 'long' Fixes: 44614/clusterfuzz-testcase-minimized-ffmpeg_dem_WEBM_DASH_MANIFEST_fuzzer-6216204841254912 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 36680078ca3302496d9b0b8a8d7168ce9eabb2bc) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/matroskadec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index ce886bda3a..6344f06282 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2490,6 +2490,8 @@ static int matroska_read_header(AVFormatContext *s)
if (!matroska->time_scale)
matroska->time_scale = 1000000;
+ if (isnan(matroska->duration))
+ matroska->duration = 0;
if (matroska->duration)
matroska->ctx->duration = matroska->duration * matroska->time_scale *
1000 / AV_TIME_BASE;