mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-17 20:17:55 +02:00
avformat/aviobuf: Delay buffer downsizing until asserts are met
Fixes: Assertion failure Fixes: 15151/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5757079496687616 Fixes: 15205/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5767573242642432 May fix: Ticket7094 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 0334632d5c02720f1829d59cd20c009584b5b163) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
6aaca5234d
commit
241f59eb8b
@ -557,7 +557,7 @@ static void fill_buffer(AVIOContext *s)
|
||||
}
|
||||
|
||||
/* make buffer smaller in case it ended up large after probing */
|
||||
if (s->read_packet && s->orig_buffer_size && s->buffer_size > s->orig_buffer_size) {
|
||||
if (s->read_packet && s->orig_buffer_size && s->buffer_size > s->orig_buffer_size && len >= s->orig_buffer_size) {
|
||||
if (dst == s->buffer && s->buf_ptr != dst) {
|
||||
int ret = ffio_set_buf_size(s, s->orig_buffer_size);
|
||||
if (ret < 0)
|
||||
@ -565,7 +565,6 @@ static void fill_buffer(AVIOContext *s)
|
||||
|
||||
s->checksum_ptr = dst = s->buffer;
|
||||
}
|
||||
av_assert0(len >= s->orig_buffer_size);
|
||||
len = s->orig_buffer_size;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user