summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-09-13 17:07:19 -0300
committerLuca Barbato <lu_zero@gentoo.org>2017-10-09 11:48:44 +0200
commit2014231039deeb6dccbf9f5368deb5f9e89d6cd0 (patch)
tree8e0178e9955f4f9caeeadaedc15277725fc0dc65
parent3d828c9fd51aa8c348ff11241e212e5834b4f806 (diff)
extract_extradata: return an error when buffer allocation fails
ret is 0 by default. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r--libavcodec/extract_extradata_bsf.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c
index 20840bd6af..100c60d063 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;
}