From: Michael Niedermayer Date: Tue, 9 May 2017 11:25:34 +0000 (+0200) Subject: avcodec/flacdec: Return error code instead of 0 for failures X-Git-Tag: n3.4~1654 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=3f5a68533decdfb4757207e8d7b5af06e1dcd197 avcodec/flacdec: Return error code instead of 0 for failures Fixes: infinite loop Fixes: 1418/clusterfuzz-testcase-minimized-5934472438480896 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer --- diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index f73a32b461..581c73efc8 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -205,12 +205,12 @@ static int get_metadata_size(const uint8_t *buf, int buf_size) buf += 4; do { if (buf_end - buf < 4) - return 0; + return AVERROR_INVALIDDATA; flac_parse_block_header(buf, &metadata_last, NULL, &metadata_size); buf += 4; if (buf_end - buf < metadata_size) { /* need more data in order to read the complete header */ - return 0; + return AVERROR_INVALIDDATA; } buf += metadata_size; } while (!metadata_last);