From 189fbcede89bb5d7ec6c3b05d1e30f1bab3a060a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 27 Oct 2012 22:45:51 +0200 Subject: [PATCH] tak_parser: check ff_combine_frame() return code Fixes CID733706 Signed-off-by: Michael Niedermayer --- libavcodec/tak_parser.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/tak_parser.c b/libavcodec/tak_parser.c index dcc37eca8f..55766a4d78 100644 --- a/libavcodec/tak_parser.c +++ b/libavcodec/tak_parser.c @@ -66,7 +66,8 @@ static int tak_parse(AVCodecParserContext *s, AVCodecContext *avctx, int tmp_buf_size = FFMIN(2 * TAK_MAX_FRAME_HEADER_BYTES, buf_size); const uint8_t *tmp_buf = buf; - ff_combine_frame(pc, END_NOT_FOUND, &tmp_buf, &tmp_buf_size); + if (ff_combine_frame(pc, END_NOT_FOUND, &tmp_buf, &tmp_buf_size) != -1) + return AVERROR(ENOMEM); consumed += tmp_buf_size; buf += tmp_buf_size; buf_size -= tmp_buf_size;