public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH v2 1/3] MdeModulePkg/Dhcp4Dxe: Remove unnecessary NULL pointer check.
@ 2019-01-18  5:16 Jiaxin Wu
  2019-01-18  5:22 ` Wu, Hao A
  0 siblings, 1 reply; 12+ messages in thread
From: Jiaxin Wu @ 2019-01-18  5:16 UTC (permalink / raw)
  To: edk2-devel; +Cc: Ye Ting, Fu Siyuan, Wu Hao A, Gao Liming, Wu Jiaxin

v2: The DHCP Instance might be destroyed in PxeDhcpDone. So,
we need safe-delete.

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

Since the value of Instance 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>
Cc: Gao Liming <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Wu Jiaxin <jiaxin.wu@intel.com>
---
 MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
index 98a22a77b4..780f8b4224 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.c
@@ -1,9 +1,9 @@
 /** @file
   EFI DHCP protocol implementation.
 
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 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
 
@@ -1646,16 +1646,13 @@ ON_EXIT:
   //
   // Iterate through all the DhcpSb Children.
   //
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &DhcpSb->Children) {
     Instance = NET_LIST_USER_STRUCT (Entry, DHCP_PROTOCOL, Link);
-
-    if ((Instance != NULL) && (Instance->Token != NULL)) {
-      Instance->Timeout--;
-      if (Instance->Timeout == 0) {
-        PxeDhcpDone (Instance);
-      }
+    Instance->Timeout--;
+    if (Instance->Timeout == 0) {
+      PxeDhcpDone (Instance);
     }
   }
 
   return ;
 
-- 
2.17.1.windows.2



^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2019-01-21 22:47 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-18  5:16 [PATCH v2 1/3] MdeModulePkg/Dhcp4Dxe: Remove unnecessary NULL pointer check Jiaxin Wu
2019-01-18  5:22 ` Wu, Hao A
2019-01-18  5:29   ` Fu, Siyuan
2019-01-18  5:31     ` Wu, Jiaxin
2019-01-18  5:38       ` Gao, Liming
2019-01-18 11:09         ` Ard Biesheuvel
2019-01-19  1:17           ` Laszlo Ersek
2019-01-20 18:25             ` Wu, Jiaxin
2019-01-21 12:53             ` Gao, Liming
2019-01-21 13:26               ` Philippe Mathieu-Daudé
2019-01-21 21:21                 ` Laszlo Ersek
2019-01-21 22:47                   ` Philippe Mathieu-Daudé

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox