virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

hwcontext_vulkan: do not use uninitialized variables on errors in CUDA code

Browse Source
This commit is contained in:
Lynne 2020-11-22 22:56:33 +01:00
parent ae8fc9922e
commit 10b3c9b533
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavutil/hwcontext_vulkan.c
View File

@ -2409,17 +2409,17 @@ static int vulkan_transfer_data_from_cuda(AVHWFramesContext *hwfc,
CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS s_s_par[AV_NUM_DATA_POINTERS] = { 0 }; CUDA_EXTERNAL_SEMAPHORE_SIGNAL_PARAMS s_s_par[AV_NUM_DATA_POINTERS] = { 0 };
ret = CHECK_CU(cu->cuCtxPushCurrent(cuda_dev->cuda_ctx)); ret = CHECK_CU(cu->cuCtxPushCurrent(cuda_dev->cuda_ctx));
if (ret < 0) { if (ret < 0)
err = AVERROR_EXTERNAL; return AVERROR_EXTERNAL;
goto fail;
}
dst_f = (AVVkFrame *)dst->data[0]; dst_f = (AVVkFrame *)dst->data[0];
ret = vulkan_export_to_cuda(hwfc, src->hw_frames_ctx, dst); ret = vulkan_export_to_cuda(hwfc, src->hw_frames_ctx, dst);
if (ret < 0) { if (ret < 0) {
goto fail; CHECK_CU(cu->cuCtxPopCurrent(&dummy));
return ret;
} }
dst_int = dst_f->internal; dst_int = dst_f->internal;
ret = CHECK_CU(cu->cuWaitExternalSemaphoresAsync(dst_int->cu_sem, s_w_par, ret = CHECK_CU(cu->cuWaitExternalSemaphoresAsync(dst_int->cu_sem, s_w_par,
@ -3120,16 +3120,15 @@ static int vulkan_transfer_data_to_cuda(AVHWFramesContext *hwfc, AVFrame *dst,
CudaFunctions *cu = cu_internal->cuda_dl; CudaFunctions *cu = cu_internal->cuda_dl;
ret = CHECK_CU(cu->cuCtxPushCurrent(cuda_dev->cuda_ctx)); ret = CHECK_CU(cu->cuCtxPushCurrent(cuda_dev->cuda_ctx));
if (ret < 0) { if (ret < 0)
err = AVERROR_EXTERNAL; return AVERROR_EXTERNAL;
goto fail;
}
dst_f = (AVVkFrame *)src->data[0]; dst_f = (AVVkFrame *)src->data[0];
err = vulkan_export_to_cuda(hwfc, dst->hw_frames_ctx, src); err = vulkan_export_to_cuda(hwfc, dst->hw_frames_ctx, src);
if (err < 0) { if (err < 0) {
goto fail; CHECK_CU(cu->cuCtxPopCurrent(&dummy));
return err;
} }
dst_int = dst_f->internal; dst_int = dst_f->internal;