From 2014231039deeb6dccbf9f5368deb5f9e89d6cd0 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Wed, 13 Sep 2017 17:07:19 -0300
Subject: [PATCH] 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>
---
libavcodec/extract_extradata_bsf.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c
index 20840bd6af6..100c60d063b 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;
}
--
GitLab