MdeModulePkg:Fix bug in function AsciiStrToIp4.

[mirror_edk2.git] / MdeModulePkg / Library / DxeNetLib / DxeNetLib.c

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index 4acd0fad2c4dd2f884284a6cf50d81ec5c1be4f9..7700f0ff825f9bc76edd875f085c304ae2b762d2 100644 (file)
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -2726,6 +2726,9 @@ NetLibAsciiStrToIp4 (
     TempStr = Ip4Str;\r
 \r
     while ((*Ip4Str != '\0') && (*Ip4Str != '.')) {\r
+      if (!NET_IS_DIGIT (*Ip4Str)) {\r
+        return EFI_INVALID_PARAMETER;\r
+      }\r
       Ip4Str++;\r
     }\r
 \r
@@ -2976,18 +2979,20 @@ NetLibStrToIp4 (
   )\r
 {\r
   CHAR8                          *Ip4Str;\r
+  UINTN                          StringSize;\r
   EFI_STATUS                     Status;\r
 \r
   if ((String == NULL) || (Ip4Address == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Ip4Str = (CHAR8 *) AllocatePool ((StrLen (String) + 1) * sizeof (CHAR8));\r
+  StringSize = StrLen (String) + 1;\r
+  Ip4Str = (CHAR8 *) AllocatePool (StringSize * sizeof (CHAR8));\r
   if (Ip4Str == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  UnicodeStrToAsciiStr (String, Ip4Str);\r
+  UnicodeStrToAsciiStrS (String, Ip4Str, StringSize);\r
 \r
   Status = NetLibAsciiStrToIp4 (Ip4Str, Ip4Address);\r
 \r
@@ -3017,18 +3022,20 @@ NetLibStrToIp6 (
   )\r
 {\r
   CHAR8                          *Ip6Str;\r
+  UINTN                          StringSize;\r
   EFI_STATUS                     Status;\r
 \r
   if ((String == NULL) || (Ip6Address == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Ip6Str = (CHAR8 *) AllocatePool ((StrLen (String) + 1) * sizeof (CHAR8));\r
+  StringSize = StrLen (String) + 1;\r
+  Ip6Str = (CHAR8 *) AllocatePool (StringSize * sizeof (CHAR8));\r
   if (Ip6Str == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  UnicodeStrToAsciiStr (String, Ip6Str);\r
+  UnicodeStrToAsciiStrS (String, Ip6Str, StringSize);\r
 \r
   Status = NetLibAsciiStrToIp6 (Ip6Str, Ip6Address);\r
 \r
@@ -3060,6 +3067,7 @@ NetLibStrToIp6andPrefix (
   )\r
 {\r
   CHAR8                          *Ip6Str;\r
+  UINTN                          StringSize;\r
   CHAR8                          *PrefixStr;\r
   CHAR8                          *TempStr;\r
   EFI_STATUS                     Status;\r
@@ -3069,12 +3077,13 @@ NetLibStrToIp6andPrefix (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Ip6Str = (CHAR8 *) AllocatePool ((StrLen (String) + 1) * sizeof (CHAR8));\r
+  StringSize = StrLen (String) + 1;\r
+  Ip6Str = (CHAR8 *) AllocatePool (StringSize * sizeof (CHAR8));\r
   if (Ip6Str == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  UnicodeStrToAsciiStr (String, Ip6Str);\r
+  UnicodeStrToAsciiStrS (String, Ip6Str, StringSize);\r
 \r
   //\r
   // Get the sub string describing prefix length.\r