From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Fri, 17 Oct 2025 09:23:28 +0000 (+0100)
Subject: efivars: fix potential memory leak
X-Git-Tag: v259-rc1~294^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05d45875f74cfb7455d127a5229dca440986e689;p=thirdparty%2Fsystemd.git

efivars: fix potential memory leak

If 'ret' is not passed, 'x' is leaked

Follow-up for c8d60ae79d1763c6ef16fdb306b65d909a769de8

CID#1621673
---

diff --git a/src/basic/efivars.c b/src/basic/efivars.c
index 86544d1de26..99c47e8ce2e 100644
--- a/src/basic/efivars.c
+++ b/src/basic/efivars.c
@@ -155,9 +155,8 @@ int efi_get_variable(
 }
 
 int efi_get_variable_string(const char *variable, char **ret) {
-        _cleanup_free_ void *s = NULL;
+        _cleanup_free_ void *s = NULL, *x = NULL;
         size_t ss = 0;
-        char *x;
         int r;
 
         assert(variable);
@@ -171,7 +170,7 @@ int efi_get_variable_string(const char *variable, char **ret) {
                 return -ENOMEM;
 
         if (ret)
-                *ret = x;
+                *ret = TAKE_PTR(x);
 
         return 0;
 }