virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/nvenc: fix potential NULL pointer dereference

Browse Source 
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
This commit is contained in:
Zhao Zhili
2023-02-28 19:12:17 +01:00
committed by Timo Rothenpieler
parent 67fd1b79e7
commit 21101d9eb1
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/nvenc.c
View File

@@ -178,6 +178,8 @@ static void reorder_queue_flush(AVFifo *queue)
{ {
FrameData fd; FrameData fd;
av_assert0(queue);
while (av_fifo_read(queue, &fd, 1) >= 0) while (av_fifo_read(queue, &fd, 1) >= 0)
av_buffer_unref(&fd.frame_opaque_ref); av_buffer_unref(&fd.frame_opaque_ref);
} }
@@ -1853,8 +1855,11 @@ av_cold int ff_nvenc_encode_close(AVCodecContext *avctx)
p_nvenc->nvEncEncodePicture(ctx->nvencoder, &params); p_nvenc->nvEncEncodePicture(ctx->nvencoder, &params);
} }
if (ctx->reorder_queue) {
reorder_queue_flush(ctx->reorder_queue); reorder_queue_flush(ctx->reorder_queue);
av_fifo_freep2(&ctx->reorder_queue); av_fifo_freep2(&ctx->reorder_queue);
}
av_fifo_freep2(&ctx->output_surface_ready_queue); av_fifo_freep2(&ctx->output_surface_ready_queue);
av_fifo_freep2(&ctx->output_surface_queue); av_fifo_freep2(&ctx->output_surface_queue);
av_fifo_freep2(&ctx->unused_surface_queue); av_fifo_freep2(&ctx->unused_surface_queue);