From d08330e7314aa0efb48dfdff3257f73a5c35cd39 Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Thu, 16 Dec 2021 15:54:02 -0800
Subject: [PATCH] vulkan: Fix leak of error messages

Fixes: 0cad3beb2a0d ("vulkan/log: Add common vk_error and vk_errorf helpers")
Acked-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14235>
(cherry picked from commit bdb8e615d1a1ff6cce935ee5544748d61db1bb5c)
---
 .pick_status.json        | 2 +-
 src/vulkan/util/vk_log.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 86caea18213..4f4eedb8e89 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4036,7 +4036,7 @@
         "description": "vulkan: Fix leak of error messages",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "0cad3beb2a0dda7a8f6c6a1e8c9d253b9c988a9f"
     },
diff --git a/src/vulkan/util/vk_log.c b/src/vulkan/util/vk_log.c
index 8ca33edf943..b085b369f62 100644
--- a/src/vulkan/util/vk_log.c
+++ b/src/vulkan/util/vk_log.c
@@ -305,6 +305,8 @@ __vk_errorv(const void *_obj, VkResult error,
                   VK_LOG_NO_OBJS(instance), file, line,
                   "%s (%s)", message, error_str);
       }
+
+      ralloc_free(message);
    } else {
       if (object) {
          __vk_log(VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT,