mirror of https://git.ffmpeg.org/ffmpeg.git
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>
This commit is contained in:
parent
6b368bcb85
commit
6ad7403bce
|
@ -495,6 +495,8 @@ static int wv_unpack_dsd_high(WavpackFrameContext *s, uint8_t *dst_left, uint8_t
|
||||||
sp[0].fltr0 = 0;
|
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)) {
|
while (DSD_BYTE_READY(high, low) && bytestream2_get_bytes_left(&s->gbyte)) {
|
||||||
value = (value << 8) | bytestream2_get_byte(&s->gbyte);
|
value = (value << 8) | bytestream2_get_byte(&s->gbyte);
|
||||||
high = (high << 8) | 0xff;
|
high = (high << 8) | 0xff;
|
||||||
|
@ -530,6 +532,8 @@ static int wv_unpack_dsd_high(WavpackFrameContext *s, uint8_t *dst_left, uint8_t
|
||||||
sp[1].fltr0 = 0;
|
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)) {
|
while (DSD_BYTE_READY(high, low) && bytestream2_get_bytes_left(&s->gbyte)) {
|
||||||
value = (value << 8) | bytestream2_get_byte(&s->gbyte);
|
value = (value << 8) | bytestream2_get_byte(&s->gbyte);
|
||||||
high = (high << 8) | 0xff;
|
high = (high << 8) | 0xff;
|
||||||
|
|
Loading…
Reference in New Issue