From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Darren Kenny <darren.kenny@oracle.com>

Date: Thu, 26 Nov 2020 12:53:10 +0000

Subject: [PATCH] loader/xnu: Fix memory leak

The code here is finished with the memory stored in name, but it only

frees it if there curvalue is valid, while it could actually free it

regardless.

The fix is a simple relocation of the grub_free() to before the test

of curvalue.

Fixes: CID 96646

Signed-off-by: Darren Kenny <darren.kenny@oracle.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

---

 grub-core/loader/xnu.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c

index b33a384321c..16bfa7cec72 100644

--- a/grub-core/loader/xnu.c

+++ b/grub-core/loader/xnu.c

@@ -1392,9 +1392,9 @@ grub_xnu_fill_devicetree (void)

     name[len] = 0;

     curvalue = grub_xnu_create_value (curkey, name);

-    if (!curvalue)

-      return grub_errno;

     grub_free (name);

+    if (!curvalue)

+      return grub_errno;

     data = grub_malloc (grub_strlen (var->value) + 1);

     if (!data)