NetworkPkg: Fix unspecified address use case in IpsecConfig

[mirror_edk2.git] / NetworkPkg / Application / IpsecConfig / Indexer.c

diff --git a/NetworkPkg/Application/IpsecConfig/Indexer.c b/NetworkPkg/Application/IpsecConfig/Indexer.c
index 83ceda4b57f04043889c1da9965b19d0d3bc9c80..353b22e06a8777118b35d9b9b8c622ead8b41060 100644 (file)
--- a/NetworkPkg/Application/IpsecConfig/Indexer.c
+++ b/NetworkPkg/Application/IpsecConfig/Indexer.c
@@ -1,7 +1,7 @@
 /** @file\r
   The implementation of construct ENTRY_INDEXER in IpSecConfig application.\r
 \r
-  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 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
@@ -44,17 +44,19 @@ ConstructSpdIndexer (
   } else if (ShellCommandLineGetFlag (ParamPackage, L"-e")) {\r
     ValueStr = ShellCommandLineGetValue (ParamPackage, L"-e");\r
   } else {\r
-    ASSERT (FALSE);\r
+    return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  ASSERT (ValueStr != NULL);\r
-\r
+  if (ValueStr == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+  \r
   Value64 = StrToUInteger (ValueStr, &Status);\r
   if (!EFI_ERROR (Status)) {\r
     Indexer->Index = (UINTN) Value64;\r
-    Indexer->Name  = NULL;\r
+    ZeroMem (Indexer->Name, MAX_PEERID_LEN);\r
   } else {\r
-    UnicodeStrToAsciiStr (ValueStr, (CHAR8 *) Indexer->Name);\r
+    UnicodeStrToAsciiStrS (ValueStr, (CHAR8 *) Indexer->Name, MAX_PEERID_LEN);\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -89,10 +91,12 @@ ConstructSadIndexer (
   } else if (ShellCommandLineGetFlag (ParamPackage, L"-e")) {\r
     ValueStr = ShellCommandLineGetValue (ParamPackage, L"-e");\r
   } else {\r
-    ASSERT (FALSE);\r
+    return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  ASSERT (ValueStr != NULL);\r
+  if (ValueStr == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
 \r
   Value64 = StrToUInteger (ValueStr, &Status);\r
   if (!EFI_ERROR (Status)) {\r
@@ -187,10 +191,12 @@ ConstructPadIndexer (
   } else if (ShellCommandLineGetFlag (ParamPackage, L"-e")) {\r
     ValueStr = ShellCommandLineGetValue (ParamPackage, L"-e");\r
   } else {\r
-    ASSERT (FALSE);\r
+    return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  ASSERT (ValueStr != NULL);\r
+  if (ValueStr == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
 \r
   Value64 = StrToUInteger (ValueStr, &Status);\r
 \r