From bbd6b0106e9e725853d12550527aa03f11c09fcf Mon Sep 17 00:00:00 2001 From: Dandan Bi Date: Mon, 29 Feb 2016 10:08:47 +0800 Subject: [PATCH] MdeModulePkg: FileExplorerLib: Add check when to call FreePool function when free up resource allocated for a MenuEntry, there exists the case that the DevicePath and DisplayString are NULL, so before calling FreePool function, need to check. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Dandan Bi Reviewed-by: Eric Dong --- MdeModulePkg/Library/FileExplorerLib/FileExplorer.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c index 9714dbcf5d..98c81dbef9 100644 --- a/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c +++ b/MdeModulePkg/Library/FileExplorerLib/FileExplorer.c @@ -302,7 +302,9 @@ LibDestroyMenuEntry ( FileContext = (FILE_CONTEXT *) MenuEntry->VariableContext; if (!FileContext->IsRoot) { - FreePool (FileContext->DevicePath); + if (FileContext->DevicePath != NULL) { + FreePool (FileContext->DevicePath); + } } else { if (FileContext->FileHandle != NULL) { FileContext->FileHandle->Close (FileContext->FileHandle); @@ -315,7 +317,9 @@ LibDestroyMenuEntry ( FreePool (FileContext); - FreePool (MenuEntry->DisplayString); + if (MenuEntry->DisplayString != NULL) { + FreePool (MenuEntry->DisplayString); + } if (MenuEntry->HelpString != NULL) { FreePool (MenuEntry->HelpString); } -- 2.39.2