tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-04-08 17:05:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update network stack code to use StrnCpy instead of StrCpy.

Browse Source 
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu, Siyuan <siyuan.fu@intel.com>
Reviewed-By: Dong, Eric <eric.dong@intel.com>
Reviewed-by: Wu, Jiaxin <jiaxin.wu@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15773 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Fu, Siyuan 2014-08-08 00:41:14 +00:00 committed by sfu5
parent 8f9bafeea6
commit 2922e29ad8
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NetworkPkg/Application/IfConfig6/IfConfig6.c
View File

@ -136,7 +136,7 @@ SplitStrToList (
// //
Str = (CHAR16 *) AllocateZeroPool (StrSize (String)); Str = (CHAR16 *) AllocateZeroPool (StrSize (String));
ASSERT (Str != NULL); ASSERT (Str != NULL);
Str = StrCpy (Str, String); Str = StrnCpy (Str, String, StrLen (String));
ArgStr = Str; ArgStr = Str;
// //
@ -1720,7 +1720,7 @@ IfConfig6Initialize (
Str = (CHAR16 *) AllocateZeroPool (StrSize (ValueStr)); Str = (CHAR16 *) AllocateZeroPool (StrSize (ValueStr));
ASSERT (Str != NULL); ASSERT (Str != NULL);
Str = StrCpy (Str, ValueStr); Str = StrnCpy (Str, ValueStr, StrLen (ValueStr));
Private->IfName = Str; Private->IfName = Str;
} }
} }
@ -1734,7 +1734,7 @@ IfConfig6Initialize (
Str = (CHAR16 *) AllocateZeroPool (StrSize (ValueStr)); Str = (CHAR16 *) AllocateZeroPool (StrSize (ValueStr));
ASSERT (Str != NULL); ASSERT (Str != NULL);
Str = StrCpy (Str, ValueStr); Str = StrnCpy (Str, ValueStr, StrLen (ValueStr));
Private->IfName = Str; Private->IfName = Str;
} }
} }

4
NetworkPkg/Dhcp6Dxe/ComponentName.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
UEFI Component Name(2) protocol implementation for Dhcp6 driver. UEFI Component Name(2) protocol implementation for Dhcp6 driver.
Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -281,7 +281,7 @@ UpdateName (
if (Dhcp6ModeData.Ia == NULL) { if (Dhcp6ModeData.Ia == NULL) {
UnicodeSPrint (HandleName, sizeof (HandleName), L"DHCPv6 (No configured IA)"); UnicodeSPrint (HandleName, sizeof (HandleName), L"DHCPv6 (No configured IA)");
} else { } else {
StrCpy (HandleName, mDhcp6ControllerName[Dhcp6ModeData.Ia->State]); StrnCpy (HandleName, mDhcp6ControllerName[Dhcp6ModeData.Ia->State], sizeof (HandleName) / sizeof (CHAR16) - 1);
} }
Status = AddUnicodeString2 ( Status = AddUnicodeString2 (

2
NetworkPkg/IScsiDxe/IScsiMisc.c
View File

@ -209,7 +209,7 @@ IScsiLunToUnicodeStr (
for (Index = 0; Index < 4; Index++) { for (Index = 0; Index < 4; Index++) {
if ((Lun[2 * Index] | Lun[2 * Index + 1]) == 0) { if ((Lun[2 * Index] | Lun[2 * Index + 1]) == 0) {
StrCpy (TempStr, L"0-"); StrnCpy (TempStr, L"0-", StrLen (L"0-"));
} else { } else {
TempStr[0] = (CHAR16) IScsiHexString[Lun[2 * Index] >> 4]; TempStr[0] = (CHAR16) IScsiHexString[Lun[2 * Index] >> 4];
TempStr[1] = (CHAR16) IScsiHexString[Lun[2 * Index] & 0x0F]; TempStr[1] = (CHAR16) IScsiHexString[Lun[2 * Index] & 0x0F];

8
NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
View File

@ -718,9 +718,9 @@ Ip6ConvertInterfaceInfoToString (
// Print the interface type. // Print the interface type.
// //
if (IfInfo->IfType == Ip6InterfaceTypeEthernet) { if (IfInfo->IfType == Ip6InterfaceTypeEthernet) {
StrCpy (PortString, IP6_ETHERNET); StrnCpy (PortString, IP6_ETHERNET, sizeof (PortString) / sizeof (CHAR16) - 1);
} else if (IfInfo->IfType == Ip6InterfaceTypeExperimentalEthernet) { } else if (IfInfo->IfType == Ip6InterfaceTypeExperimentalEthernet) {
StrCpy (PortString, IP6_EXPERIMENTAL_ETHERNET); StrnCpy (PortString, IP6_EXPERIMENTAL_ETHERNET, sizeof (PortString) / sizeof (CHAR16) - 1);
} else { } else {
// //
// Refer to RFC1700, chapter Number Hardware Type. // Refer to RFC1700, chapter Number Hardware Type.
@ -747,9 +747,9 @@ Ip6ConvertInterfaceInfoToString (
for (Index = 0; Index < IfInfo->HwAddressSize; Index++) { for (Index = 0; Index < IfInfo->HwAddressSize; Index++) {
if (IfInfo->HwAddress.Addr[Index] < 0x10) { if (IfInfo->HwAddress.Addr[Index] < 0x10) {
StrCpy (FormatString, L"0%x-"); StrnCpy (FormatString, L"0%x-", sizeof (FormatString) / sizeof (CHAR16) - 1);
} else { } else {
StrCpy (FormatString, L"%x-"); StrnCpy (FormatString, L"%x-", sizeof (FormatString) / sizeof (CHAR16) - 1);
} }
Number = UnicodeSPrint ( Number = UnicodeSPrint (

4
NetworkPkg/IpSecDxe/Ikev2/Payload.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
The implementation of Payloads Creation. The implementation of Payloads Creation.
Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -1393,7 +1393,7 @@ Ikev2ParserNotifyCookiePayload (
CopyMem ( CopyMem (
IkeSaSession->NCookie, IkeSaSession->NCookie,
NotifyPayload + sizeof (IKEV2_NOTIFY), (UINT8 *)NotifyPayload + sizeof (IKEV2_NOTIFY),
NotifyDataSize NotifyDataSize
); );