har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/cuviddec: fix null pointer dereference

Browse Source 
It can happened on error path of cuvid_decode_init().

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
This commit is contained in:
Zhao Zhili 2022-06-24 22:42:01 +08:00 committed by Timo Rothenpieler
parent 3607d7bbea
commit 7389a49fd3
1 changed files with 11 additions and 9 deletions

20
libavcodec/cuviddec.c

@ -653,21 +653,23 @@ error:
static av_cold int cuvid_decode_end(AVCodecContext *avctx) static av_cold int cuvid_decode_end(AVCodecContext *avctx)
{ {
CuvidContext *ctx = avctx->priv_data; CuvidContext *ctx = avctx->priv_data;
AVHWDeviceContext *device_ctx = (AVHWDeviceContext *)ctx->hwdevice->data; AVHWDeviceContext *device_ctx = ctx->hwdevice ? (AVHWDeviceContext *)ctx->hwdevice->data : NULL;
AVCUDADeviceContext *device_hwctx = device_ctx->hwctx; AVCUDADeviceContext *device_hwctx = device_ctx ? device_ctx->hwctx : NULL;
CUcontext dummy, cuda_ctx = device_hwctx->cuda_ctx; CUcontext dummy, cuda_ctx = device_hwctx ? device_hwctx->cuda_ctx : NULL;
av_fifo_freep(&ctx->frame_queue); av_fifo_freep(&ctx->frame_queue);
ctx->cudl->cuCtxPushCurrent(cuda_ctx); if (cuda_ctx) {
ctx->cudl->cuCtxPushCurrent(cuda_ctx);
if (ctx->cuparser) if (ctx->cuparser)
ctx->cvdl->cuvidDestroyVideoParser(ctx->cuparser); ctx->cvdl->cuvidDestroyVideoParser(ctx->cuparser);
if (ctx->cudecoder) if (ctx->cudecoder)
ctx->cvdl->cuvidDestroyDecoder(ctx->cudecoder); ctx->cvdl->cuvidDestroyDecoder(ctx->cudecoder);
ctx->cudl->cuCtxPopCurrent(&dummy); ctx->cudl->cuCtxPopCurrent(&dummy);
}
ctx->cudl = NULL; ctx->cudl = NULL;