NetworkPkg/DnsDxe: Remove unnecessary NULL pointer check.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1469

Since the value of ItemCache4/ItemCache6 is retrieved from the list
Entry, it can't be the NULL pointer, so just remove the unnecessary
check.

Cc: Ye Ting <ting.ye@intel.com>
Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Wu Hao A <hao.a.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Wu Hao A <hao.a.wu@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>

1 files changed, 9 insertions, 13 deletions

diff --git a/NetworkPkg/DnsDxe/DnsDriver.c b/NetworkPkg/DnsDxe/DnsDriver.c
index b74f5ba..6a4214c 100644
--- a/NetworkPkg/DnsDxe/DnsDriver.c
+++ b/NetworkPkg/DnsDxe/DnsDriver.c
@@ -1,7 +1,7 @@
 /** @file

 The driver binding and service binding protocol for DnsDxe driver.

 

-Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2015 - 2019, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -376,36 +376,32 @@ DnsUnload (
 

     while (!IsListEmpty (&mDriverData->Dns4CacheList)) {

       Entry = NetListRemoveHead (&mDriverData->Dns4CacheList);

+      ASSERT (Entry != NULL);

       ItemCache4 = NET_LIST_USER_STRUCT (Entry, DNS4_CACHE, AllCacheLink);

-      if (ItemCache4->DnsCache.HostName != NULL) {

-        FreePool (ItemCache4->DnsCache.HostName);

-      }

-      if (ItemCache4->DnsCache.IpAddress != NULL) {

-        FreePool (ItemCache4->DnsCache.IpAddress);

-      }

+      FreePool (ItemCache4->DnsCache.HostName);

+      FreePool (ItemCache4->DnsCache.IpAddress);

       FreePool (ItemCache4);

     }

 

     while (!IsListEmpty (&mDriverData->Dns4ServerList)) {

       Entry = NetListRemoveHead (&mDriverData->Dns4ServerList);

+      ASSERT (Entry != NULL);

       ItemServerIp4 = NET_LIST_USER_STRUCT (Entry, DNS4_SERVER_IP, AllServerLink);

       FreePool (ItemServerIp4);

     }

 

     while (!IsListEmpty (&mDriverData->Dns6CacheList)) {

       Entry = NetListRemoveHead (&mDriverData->Dns6CacheList);

+      ASSERT (Entry != NULL);

       ItemCache6 = NET_LIST_USER_STRUCT (Entry, DNS6_CACHE, AllCacheLink);

-      if (ItemCache6->DnsCache.HostName != NULL) {

-        FreePool (ItemCache6->DnsCache.HostName);

-      }

-      if (ItemCache6->DnsCache.IpAddress != NULL) {

-        FreePool (ItemCache6->DnsCache.IpAddress);

-      }

+      FreePool (ItemCache6->DnsCache.HostName);

+      FreePool (ItemCache6->DnsCache.IpAddress);

       FreePool (ItemCache6);

     }

 

     while (!IsListEmpty (&mDriverData->Dns6ServerList)) {

       Entry = NetListRemoveHead (&mDriverData->Dns6ServerList);

+      ASSERT (Entry != NULL);

       ItemServerIp6 = NET_LIST_USER_STRUCT (Entry, DNS6_SERVER_IP, AllServerLink);

       FreePool (ItemServerIp6);

     }