Check the pointer before use it to avoid potential access violation.

[mirror_edk2.git] / ShellPkg / Library / UefiShellLib / UefiShellLib.c

diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
index 474aecb7ae5ebffcd11e7463ff727738d24cb1a2..42ae6e9bb0cd7d92204907d184f8e4267f5b8ed5 100644 (file)
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
@@ -2236,14 +2236,9 @@ ShellCommandLineGetFlag (
   CHAR16                        *TempString;\r
 \r
   //\r
-  // ASSERT that both CheckPackage and KeyString aren't NULL\r
+  // return FALSE for no package or KeyString is NULL\r
   //\r
-  ASSERT(KeyString != NULL);\r
-\r
-  //\r
-  // return FALSE for no package\r
-  //\r
-  if (CheckPackage == NULL) {\r
+  if (CheckPackage == NULL || KeyString == NULL) {\r
     return (FALSE);\r
   }\r
 \r
@@ -2305,9 +2300,9 @@ ShellCommandLineGetValue (
   CHAR16                        *TempString;\r
 \r
   //\r
-  // check for CheckPackage == NULL\r
+  // return NULL for no package or KeyString is NULL\r
   //\r
-  if (CheckPackage == NULL) {\r
+  if (CheckPackage == NULL || KeyString == NULL) {\r
     return (NULL);\r
   }\r
 \r