Refine code and check null pointer error.

Signed-off-by: ydong10
Reviewed-by: mdkinney
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12532 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
index 617ba54509218216828eb0c268d52bc4c9817db8..52d348c5720e50302d8a1096559fbd06895693ad 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/String.c
@@ -1972,20 +1972,16 @@ AsciiHiiToLower (
   IN CHAR8  *ConfigString\r
   )\r
 {\r
-  CHAR8      *String;\r
-\r
   ASSERT (ConfigString != NULL);\r
 \r
   //\r
   // Convert all hex digits in range [A-F] in the configuration header to [a-f]\r
   //\r
-  for (String = ConfigString; *String != '\0'; String++) {\r
-    if ( *String >= 'A' && *String <= 'Z') {\r
-      *String = (CHAR8) (*String - 'A' + 'a');\r
+  for (; *ConfigString != '\0'; ConfigString++) {\r
+    if ( *ConfigString >= 'A' && *ConfigString <= 'Z') {\r
+      *ConfigString = (CHAR8) (*ConfigString - 'A' + 'a');\r
     }\r
   }\r
-\r
-  return;\r
 }\r
 \r
 /**\r
@@ -2014,11 +2010,13 @@ HiiCompareLanguage (
   //\r
   StrLen = AsciiStrSize (Language1);\r
   Lan1   = AllocateZeroPool (StrLen);\r
+  ASSERT (Lan1 != NULL);\r
   AsciiStrCpy(Lan1, Language1);\r
   AsciiHiiToLower (Lan1);\r
 \r
   StrLen = AsciiStrSize (Language2);\r
   Lan2   = AllocateZeroPool (StrLen);\r
+  ASSERT (Lan2 != NULL);\r
   AsciiStrCpy(Lan2, Language2);\r
   AsciiHiiToLower (Lan2);\r
 \r