Initialize data and correct faulty logic in TcpComponentNameGetControllerName().

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16742 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/NetworkPkg/TcpDxe/ComponentName.c b/NetworkPkg/TcpDxe/ComponentName.c
index ecfda7a8cae2f2896025deac85c4f7de9d668a3c..41eb5a5e13b63376e4b39b54cdb1833c99e8d6d2 100644 (file)
--- a/NetworkPkg/TcpDxe/ComponentName.c
+++ b/NetworkPkg/TcpDxe/ComponentName.c
@@ -2,7 +2,7 @@
   Implementation of protocols EFI_COMPONENT_NAME_PROTOCOL and\r
   EFI_COMPONENT_NAME2_PROTOCOL.\r
 \r
-  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -253,6 +253,7 @@ UpdateTcp4Name (
   // Format the child name into the string buffer as:\r
   // TCPv4 (SrcPort=59, DestPort=60, ActiveFlag=TRUE)\r
   //\r
+  ZeroMem (&Tcp4ConfigData, sizeof (Tcp4ConfigData));\r
   Status = Tcp4->GetModeData (Tcp4, NULL, &Tcp4ConfigData, NULL, NULL, NULL);\r
   if (!EFI_ERROR (Status)) {\r
     UnicodeSPrint (HandleName, sizeof (HandleName),\r
@@ -261,7 +262,7 @@ UpdateTcp4Name (
       Tcp4ConfigData.AccessPoint.RemotePort,\r
       (Tcp4ConfigData.AccessPoint.ActiveFlag ? L"TRUE" : L"FALSE")\r
       );\r
-  } if (Status == EFI_NOT_STARTED) {\r
+  } else if (Status == EFI_NOT_STARTED) {\r
     UnicodeSPrint (\r
       HandleName,\r
       sizeof (HandleName),\r
@@ -322,6 +323,7 @@ UpdateTcp6Name (
   //\r
   // Format the child name into the string buffer.\r
   //\r
+  ZeroMem (&Tcp6ConfigData, sizeof (Tcp6ConfigData));\r
   Status = Tcp6->GetModeData (Tcp6, NULL, &Tcp6ConfigData, NULL, NULL, NULL);\r
   if (!EFI_ERROR (Status)) {\r
     UnicodeSPrint (HandleName, sizeof (HandleName),\r