Revision: 15810
http://sourceforge.net/p/edk2/code/15810
Author: sfu5
Date: 2014-08-15 05:33:34 +0000 (Fri, 15 Aug 2014)
Log Message:
-----------
Use string pointer instead string buffer to avoid string copy operation.
Use CopyMem() to guarantee the NULL terminal will always be appended to the
destination string.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu, Siyuan <[email protected]>
Reviewed-by: Yao, Jiewen <[email protected]>
Modified Paths:
--------------
trunk/edk2/NetworkPkg/Dhcp6Dxe/ComponentName.c
trunk/edk2/NetworkPkg/IScsiDxe/IScsiMisc.c
trunk/edk2/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
Modified: trunk/edk2/NetworkPkg/Dhcp6Dxe/ComponentName.c
===================================================================
--- trunk/edk2/NetworkPkg/Dhcp6Dxe/ComponentName.c 2014-08-15 03:06:48 UTC
(rev 15809)
+++ trunk/edk2/NetworkPkg/Dhcp6Dxe/ComponentName.c 2014-08-15 05:33:34 UTC
(rev 15810)
@@ -259,7 +259,7 @@
{
EFI_STATUS Status;
EFI_DHCP6_MODE_DATA Dhcp6ModeData;
- CHAR16 HandleName[64];
+ CHAR16 *HandleName;
if (Dhcp6 == NULL) {
return EFI_INVALID_PARAMETER;
@@ -279,9 +279,12 @@
}
if (Dhcp6ModeData.Ia == NULL) {
- UnicodeSPrint (HandleName, sizeof (HandleName), L"DHCPv6 (No configured
IA)");
+ HandleName = L"DHCPv6 (No configured IA)";
} else {
- StrnCpy (HandleName, mDhcp6ControllerName[Dhcp6ModeData.Ia->State], sizeof
(HandleName) / sizeof (CHAR16) - 1);
+ if (Dhcp6ModeData.Ia->State > Dhcp6Rebinding) {
+ return EFI_DEVICE_ERROR;
+ }
+ HandleName = mDhcp6ControllerName[Dhcp6ModeData.Ia->State];
}
Status = AddUnicodeString2 (
Modified: trunk/edk2/NetworkPkg/IScsiDxe/IScsiMisc.c
===================================================================
--- trunk/edk2/NetworkPkg/IScsiDxe/IScsiMisc.c 2014-08-15 03:06:48 UTC (rev
15809)
+++ trunk/edk2/NetworkPkg/IScsiDxe/IScsiMisc.c 2014-08-15 05:33:34 UTC (rev
15810)
@@ -209,7 +209,7 @@
for (Index = 0; Index < 4; Index++) {
if ((Lun[2 * Index] | Lun[2 * Index + 1]) == 0) {
- StrnCpy (TempStr, L"0-", StrLen (L"0-"));
+ CopyMem (TempStr, L"0-", sizeof (L"0-"));
} else {
TempStr[0] = (CHAR16) IScsiHexString[Lun[2 * Index] >> 4];
TempStr[1] = (CHAR16) IScsiHexString[Lun[2 * Index] & 0x0F];
@@ -223,7 +223,9 @@
TempStr += StrLen (TempStr);
}
-
+ //
+ // Remove the last '-'
+ //
Str[StrLen (Str) - 1] = 0;
for (Index = StrLen (Str) - 1; Index > 1; Index = Index - 2) {
Modified: trunk/edk2/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c
===================================================================
--- trunk/edk2/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c 2014-08-15 03:06:48 UTC (rev
15809)
+++ trunk/edk2/NetworkPkg/Ip6Dxe/Ip6ConfigNv.c 2014-08-15 05:33:34 UTC (rev
15810)
@@ -718,9 +718,9 @@
// Print the interface type.
//
if (IfInfo->IfType == Ip6InterfaceTypeEthernet) {
- StrnCpy (PortString, IP6_ETHERNET, sizeof (PortString) / sizeof (CHAR16) -
1);
+ CopyMem (PortString, IP6_ETHERNET, sizeof (IP6_ETHERNET));
} else if (IfInfo->IfType == Ip6InterfaceTypeExperimentalEthernet) {
- StrnCpy (PortString, IP6_EXPERIMENTAL_ETHERNET, sizeof (PortString) /
sizeof (CHAR16) - 1);
+ CopyMem (PortString, IP6_EXPERIMENTAL_ETHERNET, sizeof
(IP6_EXPERIMENTAL_ETHERNET));
} else {
//
// Refer to RFC1700, chapter Number Hardware Type.
@@ -747,9 +747,9 @@
for (Index = 0; Index < IfInfo->HwAddressSize; Index++) {
if (IfInfo->HwAddress.Addr[Index] < 0x10) {
- StrnCpy (FormatString, L"0%x-", sizeof (FormatString) / sizeof (CHAR16)
- 1);
+ CopyMem (FormatString, L"0%x-", sizeof (L"0%x-"));
} else {
- StrnCpy (FormatString, L"%x-", sizeof (FormatString) / sizeof (CHAR16) -
1);
+ CopyMem (FormatString, L"%x-", sizeof (L"%x-"));
}
Number = UnicodeSPrint (
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
