From: t.feng <fengtao40@huawei.com>
Date: Tue, 29 Nov 2022 09:14:12 +0000 (+0800)
Subject: fs/hfsplus: Fix memory leak in grub_hfsplus_btree_search()
X-Git-Tag: grub-2.12-rc1~199
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1e05167c8b12a1d8388241dc47e6468ff4ef17d;p=thirdparty%2Fgrub.git

fs/hfsplus: Fix memory leak in grub_hfsplus_btree_search()

Fixes: 58ea11d5b (fs/hfsplus: Don't fetch a key beyond the end of the node)

Signed-off-by: t.feng <fengtao40@huawei.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---

diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
index 6337cbfcb..11393ca34 100644
--- a/grub-core/fs/hfsplus.c
+++ b/grub-core/fs/hfsplus.c
@@ -652,7 +652,10 @@ grub_hfsplus_btree_search (struct grub_hfsplus_btree *btree,
 			 + 2);
 
 	      if ((char *) pointer > node + btree->nodesize - 2)
-		return grub_error (GRUB_ERR_BAD_FS, "HFS+ key beyond end of node");
+	        {
+	          grub_free (node);
+	          return grub_error (GRUB_ERR_BAD_FS, "HFS+ key beyond end of node");
+	        }
 
 	      currnode = grub_be_to_cpu32 (grub_get_unaligned32 (pointer));
 	      match = 1;