diff options
| author | Zhao Zhili <zhilizhao@tencent.com> | 2022-06-24 22:42:01 +0800 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2022-06-26 21:50:30 +0200 |
| commit | 7389a49fd348719d1fab393c2087183cde4dbd9c (patch) | |
| tree | 33abfe13f52857e465a9e272945cfbdd2413ccd9 | |
| parent | 3607d7bbea4fc3e601774e02ef734097f2d369af (diff) | |
| download | ffmpeg-7389a49fd348719d1fab393c2087183cde4dbd9c.tar.gz | |
avcodec/cuviddec: fix null pointer dereference
It can happened on error path of cuvid_decode_init().
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
| -rw-r--r-- | libavcodec/cuviddec.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c index 1a1906e1f2..88f1d12a00 100644 --- a/libavcodec/cuviddec.c +++ b/libavcodec/cuviddec.c @@ -653,21 +653,23 @@ 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_freep(&ctx->frame_queue); - ctx->cudl->cuCtxPushCurrent(cuda_ctx); + if (cuda_ctx) { + ctx->cudl->cuCtxPushCurrent(cuda_ctx); - if (ctx->cuparser) - ctx->cvdl->cuvidDestroyVideoParser(ctx->cuparser); + if (ctx->cuparser) + ctx->cvdl->cuvidDestroyVideoParser(ctx->cuparser); - if (ctx->cudecoder) - ctx->cvdl->cuvidDestroyDecoder(ctx->cudecoder); + if (ctx->cudecoder) + ctx->cvdl->cuvidDestroyDecoder(ctx->cudecoder); - ctx->cudl->cuCtxPopCurrent(&dummy); + ctx->cudl->cuCtxPopCurrent(&dummy); + } ctx->cudl = NULL; |