X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=ShellPkg%2FLibrary%2FUefiShellLevel1CommandsLib%2FIf.c;h=a3c4482bb3bfc3284347a7deba775f65e1ee3f0c;hp=59069e568f42d09565d005f73c85c046977bc595;hb=33c031ee2092282a069ce07d30202082ceaf61fe;hpb=6b825919f1c16b07b5cac7fc5e298fbeb530d888

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
index 59069e568f..a3c4482bb3 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
@@ -844,7 +844,17 @@ ShellCommandRunIf (
   // Make sure that an End exists.
   //
   if (!MoveToTag(GetNextNode, L"endif", L"if", NULL, ShellCommandGetCurrentScriptFile(), TRUE, TRUE, FALSE)) {
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_NO_MATCHING), gShellLevel1HiiHandle, L"EnfIf", L"If", ShellCommandGetCurrentScriptFile()->CurrentCommand->Line);
+    ShellPrintHiiEx(
+      -1, 
+      -1, 
+      NULL, 
+      STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 
+      gShellLevel1HiiHandle, 
+      L"EnfIf", 
+      L"If", 
+      ShellCommandGetCurrentScriptFile()!=NULL
+        &&ShellCommandGetCurrentScriptFile()->CurrentCommand!=NULL
+          ?ShellCommandGetCurrentScriptFile()->CurrentCommand->Line:0);
     return (SHELL_DEVICE_ERROR);
   }
 
@@ -983,16 +993,46 @@ ShellCommandRunElse (
 
 
   if (!MoveToTag(GetPreviousNode, L"if", L"endif", NULL, ShellCommandGetCurrentScriptFile(), FALSE, TRUE, FALSE)) {
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_NO_MATCHING), gShellLevel1HiiHandle, L"If", L"Else", ShellCommandGetCurrentScriptFile()->CurrentCommand->Line);
+    ShellPrintHiiEx(
+      -1, 
+      -1, 
+      NULL, 
+      STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 
+      gShellLevel1HiiHandle, 
+      L"If", 
+      L"Else", 
+      ShellCommandGetCurrentScriptFile()!=NULL
+        &&ShellCommandGetCurrentScriptFile()->CurrentCommand!=NULL
+          ?ShellCommandGetCurrentScriptFile()->CurrentCommand->Line:0);
     return (SHELL_DEVICE_ERROR);
   }
   if (!MoveToTag(GetPreviousNode, L"if", L"else", NULL, ShellCommandGetCurrentScriptFile(), FALSE, TRUE, FALSE)) {
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_NO_MATCHING), gShellLevel1HiiHandle, L"If", L"Else", ShellCommandGetCurrentScriptFile()->CurrentCommand->Line);
+    ShellPrintHiiEx(
+      -1, 
+      -1, 
+      NULL, 
+      STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 
+      gShellLevel1HiiHandle, 
+      L"If", 
+      L"Else", 
+      ShellCommandGetCurrentScriptFile()!=NULL
+        &&ShellCommandGetCurrentScriptFile()->CurrentCommand!=NULL
+          ?ShellCommandGetCurrentScriptFile()->CurrentCommand->Line:0);
     return (SHELL_DEVICE_ERROR);
   }
 
   if (!MoveToTag(GetNextNode, L"endif", L"if", NULL, ShellCommandGetCurrentScriptFile(), FALSE, FALSE, FALSE)) {
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_NO_MATCHING), gShellLevel1HiiHandle, L"EndIf", "Else", ShellCommandGetCurrentScriptFile()->CurrentCommand->Line);
+    ShellPrintHiiEx(
+      -1, 
+      -1, 
+      NULL, 
+      STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 
+      gShellLevel1HiiHandle, 
+      L"EndIf", 
+      "Else", 
+      ShellCommandGetCurrentScriptFile()!=NULL
+        &&ShellCommandGetCurrentScriptFile()->CurrentCommand!=NULL
+          ?ShellCommandGetCurrentScriptFile()->CurrentCommand->Line:0);
     return (SHELL_DEVICE_ERROR);
   }
 
@@ -1025,7 +1065,17 @@ ShellCommandRunEndIf (
   }
 
   if (!MoveToTag(GetPreviousNode, L"if", L"endif", NULL, ShellCommandGetCurrentScriptFile(), FALSE, TRUE, FALSE)) {
-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_NO_MATCHING), gShellLevel1HiiHandle, L"If", L"EndIf", ShellCommandGetCurrentScriptFile()->CurrentCommand->Line);
+    ShellPrintHiiEx(
+      -1, 
+      -1, 
+      NULL, 
+      STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 
+      gShellLevel1HiiHandle, 
+      L"If", 
+      L"EndIf", 
+      ShellCommandGetCurrentScriptFile()!=NULL
+        &&ShellCommandGetCurrentScriptFile()->CurrentCommand!=NULL
+          ?ShellCommandGetCurrentScriptFile()->CurrentCommand->Line:0);
     return (SHELL_DEVICE_ERROR);
   }