X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=ShellPkg%2FLibrary%2FUefiShellLevel2CommandsLib%2FTimeDate.c;h=780b39e2fd7cdd8183085b274df21c2fd6bbd70e;hp=115013a1e30027d73b07a23598aa05b3466c768e;hb=33c031ee2092282a069ce07d30202082ceaf61fe;hpb=6b825919f1c16b07b5cac7fc5e298fbeb530d888;ds=inline

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
index 115013a1e3..780b39e2fd 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/TimeDate.c
@@ -124,7 +124,7 @@ CheckAndSetDate (
   if (Walker1 != NULL) {
     Walker = Walker1 + 1;
   }
-  Walker1 = StrStr(Walker, L"/");
+  Walker1 = Walker!=NULL?StrStr(Walker, L"/"):NULL;
   if (Walker1 != NULL && *Walker1 == L'/') {
     *Walker1 = CHAR_NULL;
   }
@@ -133,7 +133,7 @@ CheckAndSetDate (
     if (Walker1 != NULL) {
       Walker = Walker1 + 1;
     }
-    Walker1 = StrStr(Walker, L"/");
+    Walker1 = Walker!=NULL?StrStr(Walker, L"/"):NULL;
     if (Walker1 != NULL && *Walker1 == L'/') {
       *Walker1 = CHAR_NULL;
     }
@@ -312,7 +312,7 @@ CheckAndSetTime (
     TheTime.Hour    = 0xFF;
     TheTime.Minute  = 0xFF;
 
-    Walker2          = StrStr(Walker1, L":");
+    Walker2          = Walker1!=NULL?StrStr(Walker1, L":"):NULL;
     if (Walker2 != NULL && *Walker2 == L':') {
       *Walker2 = CHAR_NULL;
     }
@@ -320,7 +320,7 @@ CheckAndSetTime (
     if (Walker2 != NULL) {
       Walker1 = Walker2 + 1;
     }
-    Walker2          = StrStr(Walker1, L":");
+    Walker2          = Walker1!=NULL?StrStr(Walker1, L":"):NULL;
     if (Walker2 != NULL && *Walker2 == L':') {
       *Walker2 = CHAR_NULL;
     }