From 2d15554850799346472683b4a2df05878dcfad48 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 4 Jul 2014 19:33:54 +0200 Subject: avcodec/mlp_parser: check ff_combine_frame() return code Fixes CID602338 Signed-off-by: Michael Niedermayer --- libavcodec/mlp_parser.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libavcodec/mlp_parser.c') diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c index dae19e756b..4bb82eebbf 100644 --- a/libavcodec/mlp_parser.c +++ b/libavcodec/mlp_parser.c @@ -230,6 +230,7 @@ static int mlp_parse(AVCodecParserContext *s, int sync_present; uint8_t parity_bits; int next; + int ret; int i, p = 0; *poutbuf_size = 0; @@ -256,7 +257,10 @@ static int mlp_parse(AVCodecParserContext *s, return buf_size; } - ff_combine_frame(&mp->pc, i - 7, &buf, &buf_size); + if ((ret = ff_combine_frame(&mp->pc, i - 7, &buf, &buf_size)) < 0) { + av_log(avctx, AV_LOG_WARNING, "ff_combine_frame failed\n"); + return ret; + } return i - 7; } -- cgit v1.2.3