From 04eb20aa85f658b86dd8b6b4fc261d2c9ff2e6a3 Mon Sep 17 00:00:00 2001
From: ydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 29 Sep 2011 06:33:23 +0000
Subject: Add pointer check for NULL before dereference it.

Signed-off-by: ydong10
Reviewed-by: rsun3, lgao4

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12472 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c  |  2 ++
 MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'MdeModulePkg/Universal/Network')

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
index 8219e01e24..c754177a1f 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
@@ -533,6 +533,8 @@ ArpMatchAddress (
   IN NET_ARP_ADDRESS  *AddressTwo
   )
 {
+  ASSERT (AddressOne != NULL && AddressTwo != NULL);
+
   if ((AddressOne->Type != AddressTwo->Type) ||
     (AddressOne->Length != AddressTwo->Length)) {
     //
diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
index 9cd1ae5cfc..0990d18035 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
@@ -419,7 +419,15 @@ Ip4Reassemble (
     }
 
     NewPacket->Ip.Ip4 = Assemble->Head;
-    CopyMem (IP4_GET_CLIP_INFO (NewPacket), Assemble->Info, sizeof (*IP4_GET_CLIP_INFO (NewPacket)));
+
+    ASSERT (Assemble->Info != NULL);
+
+    CopyMem (
+      IP4_GET_CLIP_INFO (NewPacket),
+      Assemble->Info,
+      sizeof (*IP4_GET_CLIP_INFO (NewPacket))
+      );
+
     return NewPacket;
   }
 
@@ -1272,7 +1280,9 @@ Ip4InstanceDeliverPacket (
       // headless. Trim the head off after copy. The IP head
       // may be not continuous before the data.
       //
-      Head    = NetbufAllocSpace (Dup, IP4_MAX_HEADLEN, NET_BUF_HEAD);
+      Head = NetbufAllocSpace (Dup, IP4_MAX_HEADLEN, NET_BUF_HEAD);
+      ASSERT (Head != NULL);
+      
       Dup->Ip.Ip4 = (IP4_HEAD *) Head;
 
       CopyMem (Head, Packet->Ip.Ip4, Packet->Ip.Ip4->HeadLen << 2);
-- 
cgit v1.2.3