summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-10-04 17:10:38 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-10-20 19:57:51 +0200
commit1efaac69328bdc17680924c71be7ec990f0e8f2c (patch)
treef17a579469e9e8f26a43d2c9b0ea651a64cffe7a
parent315a4459334fdc1e6b18733fb63439e9d090cebd (diff)
avformat/pjsdec: Check duration for overflow
Fixes: signed integer overflow: -3 - 9223372036854775807 cannot be represented in type 'long' Fixes: 17828/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5645915116797952 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/pjsdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/pjsdec.c b/libavformat/pjsdec.c
index 50b1a48e4e..8a5cc04f84 100644
--- a/libavformat/pjsdec.c
+++ b/libavformat/pjsdec.c
@@ -55,6 +55,8 @@ static int64_t read_ts(char **line, int *duration)
if (sscanf(*line, "%"SCNd64",%"SCNd64, &start, &end) == 2) {
*line += strcspn(*line, "\"");
*line += !!**line;
+ if (end < start || end - (uint64_t)start > INT_MAX)
+ return AV_NOPTS_VALUE;
*duration = end - start;
return start;
}