Add code to check whether the pointer 'NewBuffer' in 'FileHandelWrappers.c' and...

[mirror_edk2.git] / ShellPkg / Library / UefiShellDebug1CommandsLib / DmpStore.c

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
index afeedb09591ec95aef652b954a8476ad9d4cce66..b02048302e6d64cc387667892507a1259a1c646d 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
@@ -121,11 +121,15 @@ CascadeProcessVariables (
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
     SHELL_FREE_NON_NULL(FoundVarName);\r
     FoundVarName = AllocateZeroPool (NameSize);\r
-    if (PrevName != NULL) {\r
-      StrCpy(FoundVarName, PrevName);\r
-    }\r
+    if (FoundVarName != NULL) {\r
+      if (PrevName != NULL) {\r
+        StrCpy(FoundVarName, PrevName);\r
+      }\r
 \r
-    Status = gRT->GetNextVariableName (&NameSize, FoundVarName, &FoundVarGuid);\r
+      Status = gRT->GetNextVariableName (&NameSize, FoundVarName, &FoundVarGuid);\r
+    } else {\r
+      Status = EFI_OUT_OF_RESOURCES;\r
+    }\r
   }\r
 \r
   //\r