Merge branch 'master' of https://github.com/tianocore/edk2

[mirror_edk2.git] / NetworkPkg / IpSecDxe / Ikev2 / Info.c

diff --git a/NetworkPkg/IpSecDxe/Ikev2/Info.c b/NetworkPkg/IpSecDxe/Ikev2/Info.c
index d297564f11c23d2595bafd3071b7effd0780c7b6..23e47ceea8a652658d836530375c2f64565088c2 100644 (file)
--- a/NetworkPkg/IpSecDxe/Ikev2/Info.c
+++ b/NetworkPkg/IpSecDxe/Ikev2/Info.c
@@ -1,7 +1,8 @@
 /** @file\r
   The Implementations for Information Exchange.\r
 \r
-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>\r
+  Copyright (c) 2010 - 2016, Intel Corporation. All rights reserved.<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -46,7 +47,9 @@ Ikev2InfoGenerator (
   InfoContext  = NULL;\r
   IkeSaSession = (IKEV2_SA_SESSION *) SaSession;\r
   IkePacket    = IkePacketAlloc ();\r
-  ASSERT (IkePacket != NULL);\r
+  if (IkePacket == NULL) {\r
+    return NULL;\r
+  }\r
 \r
   //\r
   // Fill IkePacket Header.\r
@@ -211,7 +214,6 @@ Ikev2InfoParser (
 {\r
   IKEV2_CHILD_SA_SESSION *ChildSaSession;\r
   IKEV2_SA_SESSION       *IkeSaSession;\r
-  IKE_PAYLOAD            *NotifyPayload;\r
   IKE_PAYLOAD            *DeletePayload;\r
   IKE_PAYLOAD            *IkePayload;\r
   IKEV2_DELETE           *Delete;\r
@@ -229,7 +231,6 @@ Ikev2InfoParser (
   \r
   IkeSaSession   = (IKEV2_SA_SESSION *) SaSession;\r
 \r
-  NotifyPayload  = NULL;\r
   DeletePayload  = NULL;\r
   Private        = NULL;\r
   RespondPacket  = NULL;\r