diff mbox series

[FFmpeg-devel,1/2] avcodec/cuviddec: fix null pointer dereference

Message ID tencent_88C5C1E1B4106A9201C168227F9AAC923A0A@qq.com
State New
Headers show
Series [FFmpeg-devel,1/2] avcodec/cuviddec: fix null pointer dereference | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Zhao Zhili June 24, 2022, 2:42 p.m. UTC 
From: Zhao Zhili <zhilizhao@tencent.com>

It can happened on error path of cuvid_decode_init().
---
 libavcodec/cuviddec.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
diff mbox series

Patch

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;