v3: Add the instance token check.
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>
Reviewed-by: Wu Hao A <hao.a.wu@intel.com>
/** @file\r
EFI DHCP protocol implementation.\r
\r
/** @file\r
EFI DHCP protocol implementation.\r
\r
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
//\r
NET_LIST_FOR_EACH_SAFE (Entry, Next, &DhcpSb->Children) {\r
Instance = NET_LIST_USER_STRUCT (Entry, DHCP_PROTOCOL, Link);\r
//\r
NET_LIST_FOR_EACH_SAFE (Entry, Next, &DhcpSb->Children) {\r
Instance = NET_LIST_USER_STRUCT (Entry, DHCP_PROTOCOL, Link);\r
-\r
- if ((Instance != NULL) && (Instance->Token != NULL)) {\r
- Instance->Timeout--;\r
- if (Instance->Timeout == 0) {\r
- PxeDhcpDone (Instance);\r
- }\r
+ Instance->Timeout--;\r
+ if (Instance->Timeout == 0 && Instance->Token != NULL) {\r
+ PxeDhcpDone (Instance);\r