diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 15:47:12 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 15:47:12 +0300 |
| commit | c5eb725fd33ee705c3c7d674ae65bbb717bf7207 (patch) | |
| tree | 27998b149b222fdb19fd20fd78b7365a7f1b731a /libavcodec/imx_dump_header_bsf.c | |
| parent | 9fb5a91c66934dab395ff32eb524a3dbe08b53d8 (diff) | |
| parent | 8a9641a652ed1546fedfda22584f79d3d423096e (diff) | |
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/imx_dump_header_bsf.c')
| -rw-r--r-- | libavcodec/imx_dump_header_bsf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/imx_dump_header_bsf.c b/libavcodec/imx_dump_header_bsf.c index be43fbc159..d53f338a4f 100644 --- a/libavcodec/imx_dump_header_bsf.c +++ b/libavcodec/imx_dump_header_bsf.c @@ -43,6 +43,8 @@ static int imx_dump_header(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx } *poutbuf = av_malloc(buf_size + 20 + FF_INPUT_BUFFER_PADDING_SIZE); + if (!*poutbuf) + return AVERROR(ENOMEM); poutbufp = *poutbuf; bytestream_put_buffer(&poutbufp, imx_header, 16); bytestream_put_byte(&poutbufp, 0x83); /* KLV BER long form */ |