fixes for NULL verification.

[mirror_edk2.git] / ShellPkg / Application / Shell / ShellEnvVar.c

diff --git a/ShellPkg/Application/Shell/ShellEnvVar.c b/ShellPkg/Application/Shell/ShellEnvVar.c
index f22fb705ddec82330397f8d1fa9ce07b8d6fdcb9..519181b56ddbb4e5cb998d4e4b65b40891df8554 100644 (file)
--- a/ShellPkg/Application/Shell/ShellEnvVar.c
+++ b/ShellPkg/Application/Shell/ShellEnvVar.c
@@ -183,7 +183,7 @@ GetEnvironmentVariableList(
             Status = SHELL_GET_ENVIRONMENT_VARIABLE_AND_ATTRIBUTES(VariableName, &VarList->Atts, &ValSize, VarList->Val);\r
           }\r
         }\r
             Status = SHELL_GET_ENVIRONMENT_VARIABLE_AND_ATTRIBUTES(VariableName, &VarList->Atts, &ValSize, VarList->Val);\r
           }\r
         }\r

-        if (!EFI_ERROR(Status)) {\r
+        if (!EFI_ERROR(Status) && VarList != NULL) {\r

           VarList->Key = AllocatePool(StrSize(VariableName));\r
           if (VarList->Key == NULL) {\r
             SHELL_FREE_NON_NULL(VarList->Val);\r
           VarList->Key = AllocatePool(StrSize(VariableName));\r
           if (VarList->Key == NULL) {\r
             SHELL_FREE_NON_NULL(VarList->Val);\r