eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-16 03:50:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/truemotion2: Fix passing null pointer to memset()

Browse Source 
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 c901627918)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2017-05-28 21:54:02 +02:00
parent b1777d92f9
commit bbc6bfae37
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/truemotion2.c
View File

@@ -907,6 +907,7 @@ static int decode_frame(AVCodecContext *avctx,
buf_size - offset); buf_size - offset);
if (t < 0) { if (t < 0) {
int j = tm2_stream_order[i]; int j = tm2_stream_order[i];
if (l->tok_lens[j])
memset(l->tokens[j], 0, sizeof(**l->tokens) * l->tok_lens[j]); memset(l->tokens[j], 0, sizeof(**l->tokens) * l->tok_lens[j]);
return t; return t;
} }