Commit 292b9b93 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/lzf: Consider the needed size in reallocation

Fixes: NULL pointer dereference
Fixes: 22381/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_NOTCHLC_fuzzer-5659879921680384.fuzz

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 5bd5c310
...@@ -49,7 +49,7 @@ int ff_lzf_uncompress(GetByteContext *gb, uint8_t **buf, int64_t *size) ...@@ -49,7 +49,7 @@ int ff_lzf_uncompress(GetByteContext *gb, uint8_t **buf, int64_t *size)
if (s < LZF_LITERAL_MAX) { if (s < LZF_LITERAL_MAX) {
s++; s++;
if (s > *size - len) { if (s > *size - len) {
*size += *size /2; *size += s + *size /2;
ret = av_reallocp(buf, *size); ret = av_reallocp(buf, *size);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -72,7 +72,7 @@ int ff_lzf_uncompress(GetByteContext *gb, uint8_t **buf, int64_t *size) ...@@ -72,7 +72,7 @@ int ff_lzf_uncompress(GetByteContext *gb, uint8_t **buf, int64_t *size)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (l > *size - len) { if (l > *size - len) {
*size += *size / 2; *size += l + *size / 2;
ret = av_reallocp(buf, *size); ret = av_reallocp(buf, *size);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment