From b18346817d57c96cc47811cf78b26653e96bd304 Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Thu, 16 Apr 2015 18:33:31 +0200 Subject: flac: fix realloc loop with invalid flac files Signed-off-by: Luca Barbato --- libavcodec/flac_parser.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'libavcodec/flac_parser.c') diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c index bf2c11821b..70b9a651e9 100644 --- a/libavcodec/flac_parser.c +++ b/libavcodec/flac_parser.c @@ -565,6 +565,15 @@ static int flac_parse(AVCodecParserContext *s, AVCodecContext *avctx, nb_desired * FLAC_AVG_FRAME_SIZE); } + if (!av_fifo_space(fpc->fifo_buf) && + av_fifo_size(fpc->fifo_buf) / FLAC_AVG_FRAME_SIZE > + fpc->nb_headers_buffered * 10) { + /* There is less than one valid flac header buffered for 10 headers + * buffered. Therefore the fifo is most likely filled with invalid + * data and the input is not a flac file. */ + goto handle_error; + } + /* Fill the buffer. */ if (av_fifo_realloc2(fpc->fifo_buf, (read_end - read_start) + av_fifo_size(fpc->fifo_buf)) < 0) { -- cgit v1.2.3