MdePkg/SafeString.c: Fix code to be more readable

[edk2] [PATCH] MdePkg/SafeString.c: Fix code to be more readable

Posted by Ruiyu Ni 7 years, 8 months ago

The change doesn't impact the functionality.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
---
 MdePkg/Library/BaseLib/SafeString.c | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/MdePkg/Library/BaseLib/SafeString.c b/MdePkg/Library/BaseLib/SafeString.c
index b7895ad..249fe47 100644
--- a/MdePkg/Library/BaseLib/SafeString.c
+++ b/MdePkg/Library/BaseLib/SafeString.c
@@ -1234,6 +1234,7 @@ StrToIpv6Address (
         //
         // Uintn won't exceed MAX_UINT16 if number of hexadecimal digit characters is no more than 4.
         //
+        ASSERT (AddressIndex + 1 < ARRAY_SIZE (Address->Addr));
         LocalAddress.Addr[AddressIndex] = (UINT8) ((UINT16) Uintn >> 8);
         LocalAddress.Addr[AddressIndex + 1] = (UINT8) Uintn;
         AddressIndex += 2;
@@ -1286,11 +1287,13 @@ StrToIpv6Address (
   }
   CopyMem (&Address->Addr[0], &LocalAddress.Addr[0], CompressStart);
   ZeroMem (&Address->Addr[CompressStart], ARRAY_SIZE (Address->Addr) - AddressIndex);
-  CopyMem (
-    &Address->Addr[CompressStart + ARRAY_SIZE (Address->Addr) - AddressIndex],
-    &LocalAddress.Addr[CompressStart],
-    AddressIndex - CompressStart
-    );
+  if (AddressIndex > CompressStart) {
+    CopyMem (
+      &Address->Addr[CompressStart + ARRAY_SIZE (Address->Addr) - AddressIndex],
+      &LocalAddress.Addr[CompressStart],
+      AddressIndex - CompressStart
+      );
+  }
 
   if (PrefixLength != NULL) {
     *PrefixLength = LocalPrefixLength;
@@ -3204,6 +3207,7 @@ AsciiStrToIpv6Address (
         //
         // Uintn won't exceed MAX_UINT16 if number of hexadecimal digit characters is no more than 4.
         //
+        ASSERT (AddressIndex + 1 < ARRAY_SIZE (Address->Addr));
         LocalAddress.Addr[AddressIndex] = (UINT8) ((UINT16) Uintn >> 8);
         LocalAddress.Addr[AddressIndex + 1] = (UINT8) Uintn;
         AddressIndex += 2;
@@ -3256,11 +3260,13 @@ AsciiStrToIpv6Address (
   }
   CopyMem (&Address->Addr[0], &LocalAddress.Addr[0], CompressStart);
   ZeroMem (&Address->Addr[CompressStart], ARRAY_SIZE (Address->Addr) - AddressIndex);
-  CopyMem (
-    &Address->Addr[CompressStart + ARRAY_SIZE (Address->Addr) - AddressIndex],
-    &LocalAddress.Addr[CompressStart],
-    AddressIndex - CompressStart
-    );
+  if (AddressIndex > CompressStart) {
+    CopyMem (
+      &Address->Addr[CompressStart + ARRAY_SIZE (Address->Addr) - AddressIndex],
+      &LocalAddress.Addr[CompressStart],
+      AddressIndex - CompressStart
+      );

+  }
 
   if (PrefixLength != NULL) {
     *PrefixLength = LocalPrefixLength;
-- 
2.9.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH] MdePkg/SafeString.c: Fix code to be more readable

Posted by Wu, Hao A 7 years, 8 months ago

Reviewed-by: Hao Wu <hao.a.wu@intel.com>

Best Regards,
Hao Wu

> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Monday, March 06, 2017 3:24 PM
> To: edk2-devel@lists.01.org
> Cc: Wu, Hao A
> Subject: [PATCH] MdePkg/SafeString.c: Fix code to be more readable
> 
> The change doesn't impact the functionality.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> ---
>  MdePkg/Library/BaseLib/SafeString.c | 26 ++++++++++++++++----------
>  1 file changed, 16 insertions(+), 10 deletions(-)
> 
> diff --git a/MdePkg/Library/BaseLib/SafeString.c
> b/MdePkg/Library/BaseLib/SafeString.c
> index b7895ad..249fe47 100644
> --- a/MdePkg/Library/BaseLib/SafeString.c
> +++ b/MdePkg/Library/BaseLib/SafeString.c
> @@ -1234,6 +1234,7 @@ StrToIpv6Address (
>          //
>          // Uintn won't exceed MAX_UINT16 if number of hexadecimal digit
> characters is no more than 4.
>          //
> +        ASSERT (AddressIndex + 1 < ARRAY_SIZE (Address->Addr));
>          LocalAddress.Addr[AddressIndex] = (UINT8) ((UINT16) Uintn >> 8);
>          LocalAddress.Addr[AddressIndex + 1] = (UINT8) Uintn;
>          AddressIndex += 2;
> @@ -1286,11 +1287,13 @@ StrToIpv6Address (
>    }
>    CopyMem (&Address->Addr[0], &LocalAddress.Addr[0], CompressStart);
>    ZeroMem (&Address->Addr[CompressStart], ARRAY_SIZE (Address->Addr) -
> AddressIndex);
> -  CopyMem (
> -    &Address->Addr[CompressStart + ARRAY_SIZE (Address->Addr) -
> AddressIndex],
> -    &LocalAddress.Addr[CompressStart],
> -    AddressIndex - CompressStart
> -    );
> +  if (AddressIndex > CompressStart) {
> +    CopyMem (
> +      &Address->Addr[CompressStart + ARRAY_SIZE (Address->Addr) -
> AddressIndex],
> +      &LocalAddress.Addr[CompressStart],
> +      AddressIndex - CompressStart
> +      );
> +  }
> 
>    if (PrefixLength != NULL) {
>      *PrefixLength = LocalPrefixLength;
> @@ -3204,6 +3207,7 @@ AsciiStrToIpv6Address (
>          //
>          // Uintn won't exceed MAX_UINT16 if number of hexadecimal digit
> characters is no more than 4.
>          //
> +        ASSERT (AddressIndex + 1 < ARRAY_SIZE (Address->Addr));
>          LocalAddress.Addr[AddressIndex] = (UINT8) ((UINT16) Uintn >> 8);
>          LocalAddress.Addr[AddressIndex + 1] = (UINT8) Uintn;
>          AddressIndex += 2;
> @@ -3256,11 +3260,13 @@ AsciiStrToIpv6Address (
>    }
>    CopyMem (&Address->Addr[0], &LocalAddress.Addr[0], CompressStart);
>    ZeroMem (&Address->Addr[CompressStart], ARRAY_SIZE (Address->Addr) -
> AddressIndex);
> -  CopyMem (
> -    &Address->Addr[CompressStart + ARRAY_SIZE (Address->Addr) -
> AddressIndex],
> -    &LocalAddress.Addr[CompressStart],
> -    AddressIndex - CompressStart
> -    );
> +  if (AddressIndex > CompressStart) {
> +    CopyMem (
> +      &Address->Addr[CompressStart + ARRAY_SIZE (Address->Addr) -
> AddressIndex],
> +      &LocalAddress.Addr[CompressStart],
> +      AddressIndex - CompressStart
> +      );
> 
> +  }
> 
>    if (PrefixLength != NULL) {
>      *PrefixLength = LocalPrefixLength;
> --
> 2.9.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel