aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/flac_parser.c
diff options
context:
space:
mode:
authorThomas Guillem <thomas@gllm.fr>2015-04-16 18:33:31 +0200
committerLuca Barbato <lu_zero@gentoo.org>2015-04-20 12:41:33 +0200
commitb18346817d57c96cc47811cf78b26653e96bd304 (patch)
tree33967da18a2b069ea95d63b272c2ca1f3411945e /libavcodec/flac_parser.c
parent2cc3936599b6fc63143036659653d1be0624360f (diff)
downloadffmpeg-b18346817d57c96cc47811cf78b26653e96bd304.tar.gz
flac: fix realloc loop with invalid flac files
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavcodec/flac_parser.c')
-rw-r--r--libavcodec/flac_parser.c9
1 files changed, 9 insertions, 0 deletions
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) {