diff options
| author | Zhao Zhili <zhilizhao@tencent.com> | 2024-02-20 20:08:55 +0800 |
|---|---|---|
| committer | Zhao Zhili <zhilizhao@tencent.com> | 2024-03-01 17:20:00 +0800 |
| commit | 3bb00c0a420c3ce83c6fafee30270d69622ccad7 (patch) | |
| tree | 953aa09d840d8dc4d3f94913c7a3623ed9ed1b80 /libavutil | |
| parent | 90bbe1e8e2d3d832a80768a6820f995153951a81 (diff) | |
avutil/hwcontext: Don't assume frames_uninit is reentrant
Fix heap use after free when vulkan_frames_init failed.
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/hwcontext.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index 1d2c2d7920..aa1329bf2b 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -359,7 +359,7 @@ int av_hwframe_ctx_init(AVBufferRef *ref) if (ctx->internal->hw_type->frames_init) { ret = ctx->internal->hw_type->frames_init(ctx); if (ret < 0) - goto fail; + return ret; } if (ctx->internal->pool_internal && !ctx->pool) @@ -369,14 +369,10 @@ int av_hwframe_ctx_init(AVBufferRef *ref) if (ctx->initial_pool_size > 0) { ret = hwframe_pool_prealloc(ref); if (ret < 0) - goto fail; + return ret; } return 0; -fail: - if (ctx->internal->hw_type->frames_uninit) - ctx->internal->hw_type->frames_uninit(ctx); - return ret; } int av_hwframe_transfer_get_formats(AVBufferRef *hwframe_ref, |