From 427d61ad4ad1462b5f4370a78eb58c1ba73680b4 Mon Sep 17 00:00:00 2001
From: Qiu Shumin <shumin.qiu@intel.com>
Date: Tue, 23 Sep 2014 06:20:59 +0000
Subject: ShellPkg: Refine code style to avoid potential NullPointer
 dereference.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Qiu Shumin <shumin.qiu@intel.com>
Reviewed-by: Ni Ruiyu <ruiyu.ni@intel.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16161 6f19259b-4bc3-4df7-8a09-765794883524
---
 ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c | 4 +++-
 ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'ShellPkg/Library/UefiShellLevel2CommandsLib')

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
index 63808424b0..a576f83446 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c
@@ -326,7 +326,9 @@ ValidateAndCopyFiles(
     } else {
       return SHELL_INVALID_PARAMETER;
     }
-  }  
+  }
+  
+  ASSERT (CleanFilePathStr != NULL);
 
   //
   // If we are trying to copy multiple files... make sure we got a directory for the target...
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
index 772cbd27f1..666cedb49d 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
@@ -289,6 +289,8 @@ ValidateAndMoveFiles(
     }
   }  
 
+  ASSERT (CleanFilePathStr != NULL);
+
   //
   // Get and validate the destination location
   //
-- 
cgit v1.2.3