[FFmpeg-devel] [PATCH 1/2] avcodec/cuviddec: fix null pointer dereference
Zhao Zhili
quinkblack at foxmail.com
Fri Jun 24 17:42:01 EEST 2022
From: Zhao Zhili <zhilizhao at tencent.com>
It can happened on error path of cuvid_decode_init().
---
libavcodec/cuviddec.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c
index fc9c0515fe..2f6bbdc7d8 100644
--- a/libavcodec/cuviddec.c
+++ b/libavcodec/cuviddec.c
@@ -655,12 +655,13 @@ error:
static av_cold int cuvid_decode_end(AVCodecContext *avctx)
{
CuvidContext *ctx = avctx->priv_data;
- AVHWDeviceContext *device_ctx = (AVHWDeviceContext *)ctx->hwdevice->data;
- AVCUDADeviceContext *device_hwctx = device_ctx->hwctx;
- CUcontext dummy, cuda_ctx = device_hwctx->cuda_ctx;
+ AVHWDeviceContext *device_ctx = ctx->hwdevice ? (AVHWDeviceContext *)ctx->hwdevice->data : NULL;
+ AVCUDADeviceContext *device_hwctx = device_ctx ? device_ctx->hwctx : NULL;
+ CUcontext dummy, cuda_ctx = device_hwctx ? device_hwctx->cuda_ctx : NULL;
av_fifo_freep2(&ctx->frame_queue);
+ if (cuda_ctx) {
ctx->cudl->cuCtxPushCurrent(cuda_ctx);
if (ctx->cuparser)
@@ -670,6 +671,7 @@ static av_cold int cuvid_decode_end(AVCodecContext *avctx)
ctx->cvdl->cuvidDestroyDecoder(ctx->cudecoder);
ctx->cudl->cuCtxPopCurrent(&dummy);
+ }
ctx->cudl = NULL;
--
2.34.1
More information about the ffmpeg-devel
mailing list