diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 13:47:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 13:47:12 +0100 |
| commit | c5eb725fd33ee705c3c7d674ae65bbb717bf7207 (patch) | |
| tree | 27998b149b222fdb19fd20fd78b7365a7f1b731a /libavcodec/parser.c | |
| parent | 9fb5a91c66934dab395ff32eb524a3dbe08b53d8 (diff) | |
| parent | 8a9641a652ed1546fedfda22584f79d3d423096e (diff) | |
| download | ffmpeg-c5eb725fd33ee705c3c7d674ae65bbb717bf7207.tar.gz | |
Merge commit '8a9641a652ed1546fedfda22584f79d3d423096e'
* commit '8a9641a652ed1546fedfda22584f79d3d423096e':
bsf: check memory allocations
Conflicts:
libavcodec/noise_bsf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/parser.c')
| -rw-r--r-- | libavcodec/parser.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 8a3be295aa..2c03b7e5c5 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -200,6 +200,8 @@ int av_parser_change(AVCodecParserContext *s, AVCodecContext *avctx, *poutbuf_size = size; *poutbuf = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); + if (!*poutbuf) + return AVERROR(ENOMEM); memcpy(*poutbuf, avctx->extradata, avctx->extradata_size); memcpy(*poutbuf + avctx->extradata_size, buf, |