NetworkPkg: Remove the redundant '/' in the end of returned ISCSIMacAddr keyword.

[mirror_edk2.git] / NetworkPkg / IScsiDxe / IScsiConfig.c

diff --git a/NetworkPkg/IScsiDxe/IScsiConfig.c b/NetworkPkg/IScsiDxe/IScsiConfig.c
index 498221a33969a11013f37ef0dd48d77cbf0180e6..c0dd305ecf6e5509fa0fb176ed39edf2a4135a3f 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiConfig.c
+++ b/NetworkPkg/IScsiDxe/IScsiConfig.c
@@ -749,14 +749,15 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (
     }\r
     CopyMem(IfrNvData->ISCSIDisplayAttemptList, AttemptNameList, ATTEMPT_NAME_LIST_SIZE);\r
 \r
+    ZeroMem (IfrNvData->ISCSIMacAddr, sizeof (IfrNvData->ISCSIMacAddr));\r
     NET_LIST_FOR_EACH (Entry, &mPrivate->NicInfoList) {\r
       NicInfo = NET_LIST_USER_STRUCT (Entry, ISCSI_NIC_INFO, Link);\r
       IScsiMacAddrToStr (\r
-      &NicInfo->PermanentAddress,\r
-      NicInfo->HwAddressSize,\r
-      NicInfo->VlanId,\r
-      MacString\r
-      );\r
+        &NicInfo->PermanentAddress,\r
+        NicInfo->HwAddressSize,\r
+        NicInfo->VlanId,\r
+        MacString\r
+        );\r
       CopyMem (\r
         IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr),\r
         MacString,\r
@@ -764,7 +765,10 @@ IScsiConvertAttemptConfigDataToIfrNvDataByKeyword (
         );\r
 \r
       *(IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr)) = L'/';\r
-     } \r
+    }\r
+    if (StrLen (IfrNvData->ISCSIMacAddr) != 0) {\r
+      *(IfrNvData->ISCSIMacAddr + StrLen (IfrNvData->ISCSIMacAddr) - 1) = L'\0';\r
+    }\r
   }\r
 }\r
 \r