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...@intel.com> Cc: Fu Siyuan <siyuan...@intel.com> Cc: Wu Hao A <hao.a...@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Wu Jiaxin <jiaxin...@intel.com> --- NetworkPkg/DnsDxe/DnsDriver.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/NetworkPkg/DnsDxe/DnsDriver.c b/NetworkPkg/DnsDxe/DnsDriver.c index b74f5ba18e..6a4214caea 100644 --- a/NetworkPkg/DnsDxe/DnsDriver.c +++ b/NetworkPkg/DnsDxe/DnsDriver.c @@ -1,9 +1,9 @@ /** @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 http://opensource.org/licenses/bsd-license.php @@ -374,40 +374,36 @@ DnsUnload ( gBS->CloseEvent (mDriverData->Timer); } 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); } FreePool (mDriverData); -- 2.17.1.windows.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
