virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avcodec/av1dec: Always set ret before goto end

Browse Source 
Before 0f8763fbea, av1_frame_ref()
and update_reference_list() could fail and therefore needed to
be checked, which incidentally set ret. This is no longer happening,
leading to a potential use of an uninitialized value which is
also the subject of Coverity ticket #1596605.

Fix this by always setting ret before goto end; do not return
some random ancient value.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2024-05-02 09:53:04 +02:00
parent 86e418ffd7
commit 9fb3d640fb
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavcodec/av1dec.c
View File

@ -1333,12 +1333,15 @@ static int av1_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame)
if (s->cur_frame.f) {
ret = set_output_frame(avctx, frame);
if (ret < 0)
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Set output frame error.\n");
goto end;
}
}
s->raw_frame_header = NULL;
i++;
ret = 0;
goto end;
}
@ -1439,17 +1442,20 @@ static int av1_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame)
update_reference_list(avctx);
if (s->raw_frame_header->show_frame && s->cur_frame.f) {
ret = set_output_frame(avctx, frame);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Set output frame error\n");
goto end;
}
}
raw_tile_group = NULL;
raw_tile_group = NULL;
s->raw_frame_header = NULL;
if (show_frame) {
// cur_frame.f needn't exist due to skip_frame.
if (s->cur_frame.f) {
ret = set_output_frame(avctx, frame);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Set output frame error\n");
goto end;
}
}
i++;
ret = 0;
goto end;
}
}