MdeModulePkg/NetworkPkg: Checking for NULL pointer before use.

Contributed-under: TianoCore Contribution Agreement 1.1

Signed-off-by: Sivaraman Nainar <sivaramann@amiindia.co.in>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
index b5cd7b7d393202364999fe3a3d45340664bc4a63..5a9d8287031ca3498cb4b7ac1f9c7713a8100119 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
@@ -1048,8 +1048,11 @@ Ip4Groups (
   // is decreamented each time an address is removed..\r
   //\r
   for (Index = IpInstance->GroupCount; Index > 0 ; Index--) {\r
-    Group = IpInstance->Groups[Index - 1];\r
-\r
+    Group = 0;         \r
+    if(IpInstance->Groups != NULL) {\r
+         Group = IpInstance->Groups[Index - 1];\r
+       }\r
+       \r
     if ((GroupAddress == NULL) || EFI_IP4_EQUAL (&Group, GroupAddress)) {\r
       if (EFI_ERROR (Ip4LeaveGroup (IpInstance, NTOHL (Group)))) {\r
         return EFI_DEVICE_ERROR;\r

diff --git a/NetworkPkg/HttpBootDxe/HttpBootConfig.c b/NetworkPkg/HttpBootDxe/HttpBootConfig.c
index f32bf18e9d64e6999cfd903ac8670515f45df2f3..81fceb2fd6bd8e0f6fc9094935c7033a5ee37f2f 100644 (file)
--- a/NetworkPkg/HttpBootDxe/HttpBootConfig.c
+++ b/NetworkPkg/HttpBootDxe/HttpBootConfig.c
@@ -473,6 +473,9 @@ HttpBootFormCallback (
     // Get user input URI string\r
     //\r
     Uri = HiiGetString (CallbackInfo->RegisteredHandle, Value->string, NULL);\r
+    if(Uri == NULL) {\r
+       return EFI_INVALID_PARAMETER;\r
+    }        \r
 \r
     //\r
     // The URI should be either an empty string (for corporate environment) ,or http(s) for home environment.\r

diff --git a/NetworkPkg/IpSecDxe/Ikev2/Utility.c b/NetworkPkg/IpSecDxe/Ikev2/Utility.c
index 2ca7f3c63cea90605c0442ed30232a8f26954106..8589af0b2a931c3fe3cd452f0bd4b14798b8229d 100644 (file)
--- a/NetworkPkg/IpSecDxe/Ikev2/Utility.c
+++ b/NetworkPkg/IpSecDxe/Ikev2/Utility.c
@@ -2438,7 +2438,7 @@ Ikev2ChildSaParseSaPayload (
   IntegrityAlgorithm       = 0;\r
   EncryptAlgorithm         = 0;\r
   EncryptKeylength         = 0;\r
-  IsMatch                  = TRUE;\r
+  IsMatch                  = FALSE;\r
   IsSupportEsn             = FALSE;\r
   PreferIsSupportEsn       = FALSE;\r
 \r