summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-04 19:33:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-04 20:29:40 +0200
commit2d15554850799346472683b4a2df05878dcfad48 (patch)
tree7d7c99bb7a64c23379e70ffa26ad7cfd76dc8c1e /libavcodec
parentd1a8659efe66af2966b585a1db2bd13123da302f (diff)
avcodec/mlp_parser: check ff_combine_frame() return code
Fixes CID602338 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mlp_parser.c6
1 files changed, 5 insertions, 1 deletions
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;
}