From e65370d770d9fc6e78516a7054aee1de1a4751d5 Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <glin@suse.com>
Date: Fri, 12 Oct 2012 20:09:33 -0400
Subject: [PATCH] Reallocate the DevPath space for the volume label

The size of the DevPath string array was not sufficient to append
the volume label. This patch extends the size for the label and
re-enables the menu freeing.
---
 MokManager.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/MokManager.c b/MokManager.c
index 0d07c33..1d84a2d 100644
--- a/MokManager.c
+++ b/MokManager.c
@@ -703,14 +703,12 @@ static UINTN draw_menu (struct menu_item *items, UINTN count) {
 static void free_menu (struct menu_item *items, UINTN count) {
 	UINTN i;
 
-#if 0
 	for (i=0; i<count; i++) {
 		if (items[i].text)
 			FreePool(items[i].text);
 	}
 
 	FreePool(items);
-#endif
 }
 
 static void run_menu (struct menu_item *items, UINTN count, UINTN timeout) {
@@ -1127,6 +1125,7 @@ static INTN filesystem_callback (void *data, void *data2, void *data3) {
 static INTN find_fs (void *data, void *data2, void *data3) {
 	EFI_GUID fs_guid = SIMPLE_FILE_SYSTEM_PROTOCOL;
 	UINTN count, i;
+	UINTN OldSize, NewSize;
 	EFI_HANDLE **filesystem_handles;
 	struct menu_item *filesystems;
 
@@ -1189,8 +1188,13 @@ static INTN find_fs (void *data, void *data2, void *data3) {
 			filesystems[i].text = DevicePathToStr(path);
 		else
 			filesystems[i].text = StrDuplicate(L"Unknown device\n");
-		if (VolumeLabel)
+		if (VolumeLabel) {
+			OldSize = (StrLen(filesystems[i].text) + 1) * sizeof(CHAR16);
+			NewSize = OldSize + StrLen(VolumeLabel) * sizeof(CHAR16);
+			filesystems[i].text = ReallocatePool(filesystems[i].text,
+							     OldSize, NewSize);
 			StrCat(filesystems[i].text, VolumeLabel);
+		}
 
 		if (buffersize)
 			FreePool(buffer);