NetworkPkg:Replace unsafe string functions.

Replace unsafe string functions with new added safe string functions.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17887 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 5 insertions, 10 deletions

diff --git a/NetworkPkg/Application/IfConfig6/IfConfig6.c b/NetworkPkg/Application/IfConfig6/IfConfig6.c
index 9e228ca7bc..4cec44f8d5 100644
--- a/NetworkPkg/Application/IfConfig6/IfConfig6.c
+++ b/NetworkPkg/Application/IfConfig6/IfConfig6.c
@@ -1,7 +1,7 @@
 /** @file

   The implementation for Shell application IfConfig6.

 

-  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2015, 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

@@ -127,16 +127,15 @@ SplitStrToList (
   ARG_LIST    *ArgList;

   ARG_LIST    *ArgNode;

 

-  if (*String == L'\0') {

+  if (*String == L'\0' || *String == NULL) {

     return NULL;

   }

 

   //

   // Copy the CONST string to a local copy.

   //

-  Str     = (CHAR16 *) AllocateZeroPool (StrSize (String));

+  Str     = AllocateCopyPool (StrSize (String), String);

   ASSERT (Str != NULL);

-  Str     = StrnCpy (Str, String, StrLen (String));

   ArgStr  = Str;

 

   //

@@ -1717,10 +1716,8 @@ IfConfig6Initialize (
     Private->OpCode = IfConfig6OpList;

     ValueStr = ShellCommandLineGetValue (ParamPackage, L"-l");

     if (ValueStr != NULL) {

-      Str             = (CHAR16 *) AllocateZeroPool (StrSize (ValueStr));

+      Str             = AllocateCopyPool (StrSize (ValueStr), ValueStr);

       ASSERT (Str != NULL);

-

-      Str             = StrnCpy (Str, ValueStr, StrLen (ValueStr));

       Private->IfName = Str;

     }

   }

@@ -1731,10 +1728,8 @@ IfConfig6Initialize (
     Private->OpCode = IfConfig6OpClear;

     ValueStr = ShellCommandLineGetValue (ParamPackage, L"-r");

     if (ValueStr != NULL) {

-      Str             = (CHAR16 *) AllocateZeroPool (StrSize (ValueStr));

+      Str             = AllocateCopyPool (StrSize (ValueStr), ValueStr);

       ASSERT (Str != NULL);

-

-      Str             = StrnCpy (Str, ValueStr, StrLen (ValueStr));

       Private->IfName = Str;

     }

   }