ShellParametersProtocol - remove parsing from within quoted parameters.

[mirror_edk2.git] / ShellPkg / Library / UefiShellLevel1CommandsLib / For.c

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
index b8e4805d922e4a81068271a527ad90ad1c7cc7a5..bc26ed31bca6d684e2bfaa751f5f11cdd299bbd5 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
@@ -589,11 +589,16 @@ ShellCommandRunFor (
     ASSERT(ArgSet       == NULL);\r
   }\r
 \r
-  Info = (SHELL_FOR_INFO*)CurrentScriptFile->CurrentCommand->Data;\r
-  if (CurrentScriptFile->CurrentCommand->Reset) {\r
-    Info->CurrentValue  = (CHAR16*)Info->Set;\r
-    FirstPass = TRUE;\r
-    CurrentScriptFile->CurrentCommand->Reset = FALSE;\r
+  if (CurrentScriptFile != NULL && CurrentScriptFile->CurrentCommand != NULL) {\r
+    Info = (SHELL_FOR_INFO*)CurrentScriptFile->CurrentCommand->Data;\r
+    if (CurrentScriptFile->CurrentCommand->Reset) {\r
+      Info->CurrentValue  = (CHAR16*)Info->Set;\r
+      FirstPass = TRUE;\r
+      CurrentScriptFile->CurrentCommand->Reset = FALSE;\r
+    }\r
+  } else {\r
+    ShellStatus = SHELL_UNSUPPORTED;\r
+    Info = NULL;\r
   }\r
   if (ShellStatus == SHELL_SUCCESS) {\r
     ASSERT(Info != NULL);\r