virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

tak_parser: check ff_combine_frame() return code

Browse Source 
Fixes CID733706
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-27 22:45:51 +02:00
parent 6078bd8024
commit 189fbcede8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/tak_parser.c
View File

@ -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); int tmp_buf_size = FFMIN(2 * TAK_MAX_FRAME_HEADER_BYTES, buf_size);
const uint8_t *tmp_buf = buf; 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; consumed += tmp_buf_size;
buf += tmp_buf_size; buf += tmp_buf_size;
buf_size -= tmp_buf_size; buf_size -= tmp_buf_size;