summaryrefslogtreecommitdiff
path: root/libavformat/rmdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-12-03 00:54:46 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2021-02-04 17:26:07 +0100
commitb12e713b8061cc6a71ec69da946552bc593d5fa7 (patch)
treee04fd74a39ae08c95db40bc084104f2d1b17864b /libavformat/rmdec.c
parent401495def62638a205569cac0f7861c7faba4d18 (diff)
downloadffmpeg-b12e713b8061cc6a71ec69da946552bc593d5fa7.tar.gz
avformat/rmdec: Reorder operations to avoid overflow
Fixes: signed integer overflow: -2147483648 - 14 cannot be represented in type 'int' Fixes: 27659/clusterfuzz-testcase-minimized-ffmpeg_dem_RM_fuzzer-5697250168406016 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/rmdec.c')
-rw-r--r--libavformat/rmdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index ae83a8afe7..0f1560a615 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -719,9 +719,9 @@ static int rm_sync(AVFormatContext *s, int64_t *timestamp, int *flags, int *stre
av_log(s, AV_LOG_WARNING,
"Index size %d (%d pkts) is wrong, should be %"PRId64".\n",
len, n_pkts, expected_len);
- len -= 14; // we already read part of the index header
- if(len<0)
+ if(len < 14)
continue;
+ len -= 14; // we already read part of the index header
goto skip;
} else if (state == MKBETAG('D','A','T','A')) {
av_log(s, AV_LOG_WARNING,