OvmfPkg/VirtioRngDxe: map host address to device address

[mirror_edk2.git] / MdeModulePkg / Library / UefiHiiLib / HiiLib.c

diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
index 857950118ff8c2a3fd51b5452b90379aad9f61af..cd0cd35a0f304600e30cc2133a1d234681af049c 100644 (file)
--- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   HII Library implementation that uses DXE protocols and services.\r
 \r
-  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -776,7 +776,14 @@ HiiConstructConfigHdr (
     // Append Guid converted to <HexCh>32\r
     //\r
     for (Index = 0, Buffer = (UINT8 *)Guid; Index < sizeof (EFI_GUID); Index++) {\r
-      String += UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *(Buffer++), 2);\r
+      UnicodeValueToStringS (\r
+        String,\r
+        MaxLen * sizeof (CHAR16) - ((UINTN)String - (UINTN)ReturnString),\r
+        PREFIX_ZERO | RADIX_HEX,\r
+        *(Buffer++),\r
+        2\r
+        );\r
+      String += StrnLenS (String, MaxLen - ((UINTN)String - (UINTN)ReturnString) / sizeof (CHAR16));\r
     }\r
   }\r
   \r
@@ -791,7 +798,14 @@ HiiConstructConfigHdr (
     // Append Name converted to <Char>NameLength\r
     //\r
     for (; *Name != L'\0'; Name++) {\r
-      String += UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *Name, 4);\r
+      UnicodeValueToStringS (\r
+        String,\r
+        sizeof (CHAR16) * MaxLen - ((UINTN)String - (UINTN)ReturnString),\r
+        PREFIX_ZERO | RADIX_HEX,\r
+        *Name,\r
+        4\r
+        );\r
+      String += StrnLenS (String, MaxLen - ((UINTN)String - (UINTN)ReturnString) / sizeof (CHAR16));\r
     }\r
   }\r
 \r
@@ -805,7 +819,14 @@ HiiConstructConfigHdr (
   // Append the device path associated with DriverHandle converted to <HexChar>DevicePathSize\r
   //\r
   for (Index = 0, Buffer = (UINT8 *)DevicePath; Index < DevicePathSize; Index++) {\r
-    String += UnicodeValueToString (String, PREFIX_ZERO | RADIX_HEX, *(Buffer++), 2);\r
+    UnicodeValueToStringS (\r
+      String,\r
+      sizeof (CHAR16) * MaxLen - ((UINTN)String - (UINTN)ReturnString),\r
+      PREFIX_ZERO | RADIX_HEX,\r
+      *(Buffer++),\r
+      2\r
+      );\r
+    String += StrnLenS (String, MaxLen - ((UINTN)String - (UINTN)ReturnString) / sizeof (CHAR16));\r
   }\r
 \r
   //\r
@@ -1853,7 +1874,7 @@ GetBlockDataInfo (
     //\r
     // Check whether VarBuffer is enough\r
     //\r
-    if ((UINTN) (Offset + Width) > MaxBufferSize) {\r
+    if ((UINT32)Offset + Width > MaxBufferSize) {\r
       DataBuffer = ReallocatePool (\r
                     MaxBufferSize,\r
                     Offset + Width + HII_LIB_DEFAULT_VARSTORE_SIZE,\r
@@ -2180,8 +2201,9 @@ InternalHiiIfrValueAction (
   }\r
   \r
   StringPtr = ConfigAltResp;\r
-  \r
-  while (StringPtr != L'\0') {\r
+  ASSERT (StringPtr != NULL);\r
+\r
+  while (*StringPtr != L'\0') {\r
     //\r
     // 1. Find <ConfigHdr> GUID=...&NAME=...&PATH=...\r
     //\r