[FFmpeg-devel] [PATCH] libavutil: fix memory leak of drmVersion (PR #20678)

[timblechmann via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>]

PR #20678 opened by timblechmann
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20678
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20678.patch

i had submitted this patch before via email, but git-send-email workflow was rather cumbersome. very happy to see i can submit a PR now


---


address sanitizer showed some leaks of drmVersion structs.
`vaapi_device_create` did not call drmFreeVersion in all possible code
paths.


>From 6d9a92244faf365cf394cd7194cc3da5a0984276 Mon Sep 17 00:00:00 2001
From: Tim Blechmann <tim@klingt.org>
Date: Wed, 25 Jun 2025 10:14:42 +0800
Subject: [PATCH] libavutil: fix memory leak of drmVersion

address sanitizer showed some leaks of drmVersion structs.
`vaapi_device_create` did not call drmFreeVersion in all possible code
paths.
---
 libavutil/hwcontext_vaapi.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c
index 51af22a607..753dcf8905 100644
--- a/libavutil/hwcontext_vaapi.c
+++ b/libavutil/hwcontext_vaapi.c
@@ -1815,6 +1815,7 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device,
                                "Failed to get DRM device info for device %d.\n", n);
                         close(priv->drm_fd);
                         priv->drm_fd = -1;
+                        drmFreeVersion(info);
                         continue;
                     }
 
@@ -1826,6 +1827,7 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device,
                         drmFreeDevice(&device);
                         close(priv->drm_fd);
                         priv->drm_fd = -1;
+                        drmFreeVersion(info);
                         continue;
                     }
                     av_log(ctx, AV_LOG_VERBOSE, "Trying to use "
@@ -1833,6 +1835,7 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device,
                            "with matching vendor id (%s).\n",
                            n, vendor_id->value);
                     drmFreeDevice(&device);
+                    drmFreeVersion(info);
                     break;
                 }
                 drmFreeVersion(info);
-- 
2.49.1

_______________________________________________
ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org
To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org