har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/flac_parser: Consider AV_INPUT_BUFFER_PADDING_SIZE

Browse Source 
Fixes: out if array read
Fixes: 40109/clusterfuzz-testcase-minimized-ffmpeg_dem_FLAC_fuzzer-4805686811295744

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Mattias Wadman <mattias.wadman@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2021-10-21 13:25:59 +02:00
parent 404c9331dd
commit 73e60e4439
1 changed files with 2 additions and 1 deletions

3
libavcodec/flac_parser.c

@ -55,6 +55,7 @@
/** largest possible size of flac header */ /** largest possible size of flac header */
#define MAX_FRAME_HEADER_SIZE 16 #define MAX_FRAME_HEADER_SIZE 16
#define MAX_FRAME_VERIFY_SIZE (MAX_FRAME_HEADER_SIZE)
typedef struct FLACHeaderMarker { typedef struct FLACHeaderMarker {
int offset; /**< byte offset from start of FLACParseContext->buffer */ int offset; /**< byte offset from start of FLACParseContext->buffer */
@ -170,7 +171,7 @@ static int find_headers_search_validate(FLACParseContext *fpc, int offset)
uint8_t *header_buf; uint8_t *header_buf;
int size = 0; int size = 0;
header_buf = flac_fifo_read_wrap(fpc, offset, header_buf = flac_fifo_read_wrap(fpc, offset,
MAX_FRAME_HEADER_SIZE, MAX_FRAME_VERIFY_SIZE + AV_INPUT_BUFFER_PADDING_SIZE,
&fpc->wrap_buf, &fpc->wrap_buf,
&fpc->wrap_buf_allocated_size); &fpc->wrap_buf_allocated_size);
if (frame_header_is_valid(fpc->avctx, header_buf, &fi)) { if (frame_header_is_valid(fpc->avctx, header_buf, &fi)) {