summaryrefslogtreecommitdiff
path: root/libavcodec/truemotion2.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-28 21:54:02 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-28 21:56:02 +0200
commitc901627918ff7480c1bb6f9cae507ee2c7c933d8 (patch)
treebfdb846a1ac5c86778e2bce028561e084a1a7233 /libavcodec/truemotion2.c
parentc9e884f3d98df85bf7f2cf30d71877b22929fdcb (diff)
avcodec/truemotion2: Fix passing null pointer to memset()
Fixes part of: 1888/clusterfuzz-testcase-minimized-5237704826552320 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 'libavcodec/truemotion2.c')
-rw-r--r--libavcodec/truemotion2.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c
index 4f0e52dbf7..e6ae05f1d5 100644
--- a/libavcodec/truemotion2.c
+++ b/libavcodec/truemotion2.c
@@ -915,7 +915,8 @@ static int decode_frame(AVCodecContext *avctx,
buf_size - offset);
if (t < 0) {
int j = tm2_stream_order[i];
- memset(l->tokens[j], 0, sizeof(**l->tokens) * l->tok_lens[j]);
+ if (l->tok_lens[j])
+ memset(l->tokens[j], 0, sizeof(**l->tokens) * l->tok_lens[j]);
return t;
}
offset += t;