virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/nutdec: Add check for avformat_new_stream

Browse Source 
Check for failure of avformat_new_stream() and propagate
the error code.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9cf652cef4)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Jiasheng Jiang 2022-02-23 10:31:59 +08:00 committed by Michael Niedermayer
parent a56d3a1ef1
commit c513bd4803
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/nutdec.c
View File

@ -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;