Re: [FFmpeg-devel] [PATCH 1/2] lavu/hwcontext_qsv: fix memory leak for d3d11va impl

["Xiang, Haihao" <haihao.xiang-at-intel.com@ffmpeg.org>]

On Vr, 2023-06-16 at 20:05 +0800, Tong Wu wrote:
> Signed-off-by: Tong Wu <tong1.wu@intel.com>
> ---
>  libavutil/hwcontext_qsv.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
> index 713dc90ffd..931f905a51 100644
> --- a/libavutil/hwcontext_qsv.c
> +++ b/libavutil/hwcontext_qsv.c
> @@ -665,6 +665,7 @@ static mfxStatus frame_get_hdl(mfxHDL pthis, mfxMemId mid,
> mfxHDL *hdl)
>  
>  static int qsv_d3d11_update_config(void *ctx, mfxHDL handle, mfxConfig cfg)
>  {
> +    int ret = AVERROR_UNKNOWN;
>  #if CONFIG_D3D11VA
>      mfxStatus sts;
>      IDXGIAdapter *pDXGIAdapter;
> @@ -679,7 +680,8 @@ static int qsv_d3d11_update_config(void *ctx, mfxHDL
> handle, mfxConfig cfg)
>          hr = IDXGIDevice_GetAdapter(pDXGIDevice, &pDXGIAdapter);
>          if (FAILED(hr)) {
>              av_log(ctx, AV_LOG_ERROR, "Error IDXGIDevice_GetAdapter %d\n",
> hr);
> -            goto fail;
> +            IDXGIDevice_Release(pDXGIDevice);
> +            return ret;
>          }
>  
>          hr = IDXGIAdapter_GetDesc(pDXGIAdapter, &adapterDesc);
> @@ -689,7 +691,7 @@ static int qsv_d3d11_update_config(void *ctx, mfxHDL
> handle, mfxConfig cfg)
>          }
>      } else {
>          av_log(ctx, AV_LOG_ERROR, "Error ID3D11Device_QueryInterface %d\n",
> hr);
> -        goto fail;
> +        return ret;
>      }
>  
>      impl_value.Type = MFX_VARIANT_TYPE_U16;
> @@ -722,11 +724,13 @@ static int qsv_d3d11_update_config(void *ctx, mfxHDL
> handle, mfxConfig cfg)
>          goto fail;
>      }
>  
> -    return 0;
> +    ret = 0;
>  
>  fail:
> +    IDXGIDevice_Release(pDXGIDevice);
> +    IDXGIAdapter_Release(pDXGIAdapter);

Please release resource in reverse order.

Thanks
Haihao


>  #endif
> -    return AVERROR_UNKNOWN;
> +    return ret;
>  }
>  
>  static int qsv_d3d9_update_config(void *ctx, mfxHDL handle, mfxConfig cfg)

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".