sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
The change doesn't impact the functionality.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
This commit is contained in:
Ruiyu Ni
2017-03-06 14:34:29 +08:00
parent 8994d2f95c
commit 5b0ce08a3e
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
MdePkg/Library/BaseLib/SafeString.c
View File

@ -1234,6 +1234,7 @@ StrToIpv6Address (
// //
// Uintn won't exceed MAX_UINT16 if number of hexadecimal digit characters is no more than 4. // 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] = (UINT8) ((UINT16) Uintn >> 8);
LocalAddress.Addr[AddressIndex + 1] = (UINT8) Uintn; LocalAddress.Addr[AddressIndex + 1] = (UINT8) Uintn;
AddressIndex += 2; AddressIndex += 2;
@ -1286,11 +1287,13 @@ StrToIpv6Address (
} }
CopyMem (&Address->Addr[0], &LocalAddress.Addr[0], CompressStart); CopyMem (&Address->Addr[0], &LocalAddress.Addr[0], CompressStart);
ZeroMem (&Address->Addr[CompressStart], ARRAY_SIZE (Address->Addr) - AddressIndex); ZeroMem (&Address->Addr[CompressStart], ARRAY_SIZE (Address->Addr) - AddressIndex);
CopyMem ( if (AddressIndex > CompressStart) {
&Address->Addr[CompressStart + ARRAY_SIZE (Address->Addr) - AddressIndex], CopyMem (
&LocalAddress.Addr[CompressStart], &Address->Addr[CompressStart + ARRAY_SIZE (Address->Addr) - AddressIndex],
AddressIndex - CompressStart &LocalAddress.Addr[CompressStart],
); AddressIndex - CompressStart
);
}
if (PrefixLength != NULL) { if (PrefixLength != NULL) {
*PrefixLength = LocalPrefixLength; *PrefixLength = LocalPrefixLength;
@ -3204,6 +3207,7 @@ AsciiStrToIpv6Address (
// //
// Uintn won't exceed MAX_UINT16 if number of hexadecimal digit characters is no more than 4. // 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] = (UINT8) ((UINT16) Uintn >> 8);
LocalAddress.Addr[AddressIndex + 1] = (UINT8) Uintn; LocalAddress.Addr[AddressIndex + 1] = (UINT8) Uintn;
AddressIndex += 2; AddressIndex += 2;
@ -3256,11 +3260,13 @@ AsciiStrToIpv6Address (
} }
CopyMem (&Address->Addr[0], &LocalAddress.Addr[0], CompressStart); CopyMem (&Address->Addr[0], &LocalAddress.Addr[0], CompressStart);
ZeroMem (&Address->Addr[CompressStart], ARRAY_SIZE (Address->Addr) - AddressIndex); ZeroMem (&Address->Addr[CompressStart], ARRAY_SIZE (Address->Addr) - AddressIndex);
CopyMem ( if (AddressIndex > CompressStart) {
&Address->Addr[CompressStart + ARRAY_SIZE (Address->Addr) - AddressIndex], CopyMem (
&LocalAddress.Addr[CompressStart], &Address->Addr[CompressStart + ARRAY_SIZE (Address->Addr) - AddressIndex],
AddressIndex - CompressStart &LocalAddress.Addr[CompressStart],
); AddressIndex - CompressStart
);
} }
if (PrefixLength != NULL) { if (PrefixLength != NULL) {