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 <siyuan.fu@intel.com>
Reviewed-by: Yao, Jiewen <jiewen.yao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15810 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Fu, Siyuan
2014-08-15 05:33:34 +00:00
committed by sfu5
parent 1be2ed90a2
commit a4faf336ea
3 changed files with 14 additions and 9 deletions

View File

@@ -259,7 +259,7 @@ UpdateName (
{
EFI_STATUS Status;
EFI_DHCP6_MODE_DATA Dhcp6ModeData;
CHAR16 HandleName[64];
CHAR16 *HandleName;
if (Dhcp6 == NULL) {
return EFI_INVALID_PARAMETER;
@@ -279,9 +279,12 @@ UpdateName (
}
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 (