summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-09-11 12:58:58 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2023-04-15 22:38:01 +0200
commit0e5ce7ac7e2063a3aa3a45121e694a2cd88d5a08 (patch)
tree25dd7d2e5727762c05739afec3a1e487279f25a3
parent93a685acccab1a0ac469c736cddca622eaa2b9bc (diff)
downloadffmpeg-0e5ce7ac7e2063a3aa3a45121e694a2cd88d5a08.tar.gz
avcodec/wavpack: Check for end of input in wv_unpack_dsd_high()
Fixes: Timeout Fixes: 50793/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVPACK_fuzzer-4980185027444736 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 6ad7403bcee47e7c5e99a9c0266935e0da50c9d2) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/wavpack.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index fc72300511..85480be573 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -498,6 +498,8 @@ static int wv_unpack_dsd_high(WavpackFrameContext *s, uint8_t *dst_left, uint8_t
sp[0].fltr0 = 0;
}
+ if (DSD_BYTE_READY(high, low) && !bytestream2_get_bytes_left(&s->gbyte))
+ return AVERROR_INVALIDDATA;
while (DSD_BYTE_READY(high, low) && bytestream2_get_bytes_left(&s->gbyte)) {
value = (value << 8) | bytestream2_get_byte(&s->gbyte);
high = (high << 8) | 0xff;
@@ -533,6 +535,8 @@ static int wv_unpack_dsd_high(WavpackFrameContext *s, uint8_t *dst_left, uint8_t
sp[1].fltr0 = 0;
}
+ if (DSD_BYTE_READY(high, low) && !bytestream2_get_bytes_left(&s->gbyte))
+ return AVERROR_INVALIDDATA;
while (DSD_BYTE_READY(high, low) && bytestream2_get_bytes_left(&s->gbyte)) {
value = (value << 8) | bytestream2_get_byte(&s->gbyte);
high = (high << 8) | 0xff;