fix K8 coding issues.

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

diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
index f105176bf69b89f81bf873c374e1c12ef1cf20bf..0d6a30e6e9ce52fb6d63c951a5f5b3d0d3541fb2 100644 (file)
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
@@ -107,7 +107,7 @@ ShellFindSE2 (
                                   Buffer\r
                                   );\r
     }\r
-    if (!EFI_ERROR (Status)) {\r
+    if (!EFI_ERROR (Status) && Buffer != NULL) {\r
       //\r
       // now parse the list of returned handles\r
       //\r
@@ -1490,6 +1490,7 @@ ShellFindFilePath (
   CHAR16            *TestPath;\r
   CONST CHAR16      *Walker;\r
   UINTN             Size;\r
+  CHAR16            *TempChar;\r
 \r
   RetVal = NULL;\r
 \r
@@ -1517,8 +1518,9 @@ ShellFindFilePath (
     Walker = (CHAR16*)Path;\r
     do {\r
       CopyMem(TestPath, Walker, StrSize(Walker));\r
-      if (StrStr(TestPath, L";") != NULL) {\r
-        *(StrStr(TestPath, L";")) = CHAR_NULL;\r
+      TempChar = StrStr(TestPath, L";");\r
+      if (TempChar != NULL) {\r
+        *TempChar = CHAR_NULL;\r
       }\r
       StrCat(TestPath, FileName);\r
       if (StrStr(Walker, L";") != NULL) {\r
@@ -1565,6 +1567,8 @@ ShellFindFilePathEx (
   CHAR16            *RetVal;\r
   CONST CHAR16      *ExtensionWalker;\r
   UINTN             Size;\r
+  CHAR16            *TempChar;\r
+\r
   ASSERT(FileName != NULL);\r
   if (FileExtension == NULL) {\r
     return (ShellFindFilePath(FileName));\r
@@ -1578,9 +1582,12 @@ ShellFindFilePathEx (
   TestPath = AllocateZeroPool(Size);\r
   for (ExtensionWalker = FileExtension ;  ; ExtensionWalker = StrStr(ExtensionWalker, L";") + 1 ){\r
     StrCpy(TestPath, FileName);\r
-    StrCat(TestPath, ExtensionWalker);\r
-    if (StrStr(TestPath, L";") != NULL) {\r
-      *(StrStr(TestPath, L";")) = CHAR_NULL;\r
+    if (ExtensionWalker != NULL) {\r
+      StrCat(TestPath, ExtensionWalker);\r
+    }\r
+    TempChar = StrStr(TestPath, L";");\r
+    if (TempChar != NULL) {\r
+      *TempChar = CHAR_NULL;\r
     }\r
     RetVal = ShellFindFilePath(TestPath);\r
     if (RetVal != NULL) {\r
@@ -2696,10 +2703,15 @@ ShellStrToUintn(
 {\r
   CONST CHAR16  *Walker;\r
   for (Walker = String; Walker != NULL && *Walker != CHAR_NULL && *Walker == L' '; Walker++);\r
-  if (StrnCmp(Walker, L"0x", 2) == 0 || StrnCmp(Walker, L"0X", 2) == 0){\r
-    return (StrHexToUintn(Walker));\r
+  if (Walker == NULL || *Walker == CHAR_NULL) {\r
+    ASSERT(FALSE);\r
+    return ((UINTN)(-1));\r
+  } else {\r
+    if (StrnCmp(Walker, L"0x", 2) == 0 || StrnCmp(Walker, L"0X", 2) == 0){\r
+      return (StrHexToUintn(Walker));\r
+    }\r
+    return (StrDecimalToUintn(Walker));\r
   }\r
-  return (StrDecimalToUintn(Walker));\r
 }\r
 \r
 /**\r