2 files changed, 5 insertions, 1 deletions
diff --git a/NetworkPkg/DnsDxe/DnsDhcp.c b/NetworkPkg/DnsDxe/DnsDhcp.c
index 4607f7b633..1cc337f0cf 100644
--- a/NetworkPkg/DnsDxe/DnsDhcp.c
+++ b/NetworkPkg/DnsDxe/DnsDhcp.c
@@ -301,6 +301,8 @@ GetDns4ServerFromDhcp4 (
   Data                       = NULL;
   InterfaceInfo              = NULL;
 
+  ZeroMem ((UINT8 *) ParaList, sizeof (ParaList));
+
   ZeroMem (&MnpConfigData, sizeof (EFI_MANAGED_NETWORK_CONFIG_DATA));
   
   ZeroMem (&DnsServerInfor, sizeof (DNS4_SERVER_INFOR));
diff --git a/NetworkPkg/DnsDxe/DnsImpl.c b/NetworkPkg/DnsDxe/DnsImpl.c
index c227093986..b196d181ca 100644
--- a/NetworkPkg/DnsDxe/DnsImpl.c
+++ b/NetworkPkg/DnsDxe/DnsImpl.c
@@ -1049,6 +1049,7 @@ IsValidDnsResponse (
       continue;
     } else {
       TxString = NetbufGetByte (Packet, 0, NULL);
+      ASSERT (TxString != NULL);
       DnsHeader = (DNS_HEADER *) TxString;
       QueryName = (CHAR8 *) (TxString + sizeof (*DnsHeader));
       QuerySection = (DNS_QUERY_SECTION *) (QueryName + AsciiStrLen (QueryName) + 1);
@@ -1426,7 +1427,8 @@ DnsOnPacketReceived (
   ASSERT (Packet != NULL);
   
   RcvString = NetbufGetByte (Packet, 0, NULL);
-
+  ASSERT (RcvString != NULL);
+  
   //
   // Parse Dns Response
   //