From 379db4ac175dccb7d4fcaed3dabd9cada453fbe0 Mon Sep 17 00:00:00 2001
From: hhuan13 <hhuan13@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 24 Aug 2011 08:48:23 +0000
Subject: 1. Refine the error handling for PXE-v4 driver.

Signed-off-by: hhuan13
Reviewed-by: xdu2, tye

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12191 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c | 4 +++-
 MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'MdeModulePkg')

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
index a9c86dc..5f3d913 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.c
@@ -565,7 +565,9 @@ PxeBcCacheDhcpOffer (
   }
 
   OfferType = CachedOffer->OfferType;
-  ASSERT (OfferType < DHCP4_PACKET_TYPE_MAX);
+  if (OfferType >= DHCP4_PACKET_TYPE_MAX) {
+    return ;
+  }
 
   if (OfferType == DHCP4_PACKET_TYPE_BOOTP) {
 
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
index 304d7c8..5e37228 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcDhcp.h
@@ -1,7 +1,7 @@
 /** @file
   Dhcp and Discover routines for PxeBc.
 
-Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2011, 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
@@ -116,8 +116,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define DHCP4_PACKET_TYPE_WFM11A           1
 #define DHCP4_PACKET_TYPE_BINL             2
 #define DHCP4_PACKET_TYPE_DHCP_ONLY        3
-#define DHCP4_PACKET_TYPE_MAX              4
-#define DHCP4_PACKET_TYPE_BOOTP            DHCP4_PACKET_TYPE_MAX
+#define DHCP4_PACKET_TYPE_BOOTP            4
+#define DHCP4_PACKET_TYPE_MAX              5
 
 #define BIT(x)  (1 << x)
 #define CTRL(x) (0x1F & (x))
-- 
cgit v1.1