diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-28 21:54:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-08-23 13:15:17 +0200 |
| commit | d1eea5ac86fd3b7ed548a284bf51a0b53b9fb556 (patch) | |
| tree | c8d7ee66c7bd0d4fc4830ca5770c54923d4d4af7 | |
| parent | 160bd70fd45e25eed5a3c309b5169d6710762d17 (diff) | |
| download | ffmpeg-d1eea5ac86fd3b7ed548a284bf51a0b53b9fb556.tar.gz | |
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>
(cherry picked from commit c901627918ff7480c1bb6f9cae507ee2c7c933d8)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/truemotion2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index dc3441559c..7c38ce1853 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -906,7 +906,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; |