diff options
| author | James Almer <jamrial@gmail.com> | 2017-09-13 17:03:56 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-09-13 17:26:52 -0300 |
| commit | 9f7042f9cd0f4911bc5cebfcb4489bbd77826841 (patch) | |
| tree | 421861f0205aa5d38d8cccad014b0b4a91239386 | |
| parent | e3a1c0491fa2beb6562f9960e9cb3af673f3bf94 (diff) | |
| download | ffmpeg-9f7042f9cd0f4911bc5cebfcb4489bbd77826841.tar.gz | |
avcodec/extract_extradata: return an error when buffer allocation fails
ret is 0 by default.
Reviewed-by: Mark Thompson <sw@jkqxz.net>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 7bae17e37ab63d1cfcea22c68c455f859db3663c)
| -rw-r--r-- | libavcodec/extract_extradata_bsf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index 4cd0ca1137..ed6509c681 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -101,14 +101,17 @@ static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt, if (s->remove) { filtered_buf = av_buffer_alloc(pkt->size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!filtered_buf) + if (!filtered_buf) { + ret = AVERROR(ENOMEM); goto fail; + } filtered_data = filtered_buf->data; } extradata = av_malloc(extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); if (!extradata) { av_buffer_unref(&filtered_buf); + ret = AVERROR(ENOMEM); goto fail; } |