aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiasheng Jiang <jiasheng@iscas.ac.cn>2022-02-23 10:31:59 +0800
committerJames Almer <jamrial@gmail.com>2023-04-16 10:51:12 -0300
commitd811434b5d731c0fad2eb5fbf3fc3e53df98ae67 (patch)
tree096d6ecc9a88bb0781b2632376d36535d11dc2d8
parent91b54b3bba95beb1a97e0dd547abf652afed17a2 (diff)
downloadffmpeg-d811434b5d731c0fad2eb5fbf3fc3e53df98ae67.tar.gz
avformat/nutdec: Add check for avformat_new_stream
Check for failure of avformat_new_stream() and propagate the error code. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 9cf652cef49d74afe3d454f27d49eb1a1394951e)
-rw-r--r--libavformat/nutdec.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index b979009dd8..a678e88781 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -358,8 +358,12 @@ static int decode_main_header(NUTContext *nut)
ret = AVERROR(ENOMEM);
goto fail;
}
- for (i = 0; i < stream_count; i++)
- avformat_new_stream(s, NULL);
+ for (i = 0; i < stream_count; i++) {
+ if (!avformat_new_stream(s, NULL)) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ }
return 0;
fail:
@@ -807,19 +811,23 @@ static int nut_read_header(AVFormatContext *s)
NUTContext *nut = s->priv_data;
AVIOContext *bc = s->pb;
int64_t pos;
- int initialized_stream_count;
+ int initialized_stream_count, ret;
nut->avf = s;
/* main header */
pos = 0;
+ ret = 0;
do {
+ if (ret == AVERROR(ENOMEM))
+ return ret;
+
pos = find_startcode(bc, MAIN_STARTCODE, pos) + 1;
if (pos < 0 + 1) {
av_log(s, AV_LOG_ERROR, "No main startcode found.\n");
goto fail;
}
- } while (decode_main_header(nut) < 0);
+ } while ((ret = decode_main_header(nut)) < 0);
/* stream headers */
pos = 0;