summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQiu Shumin <shumin.qiu@intel.com>2016-01-06 07:40:56 +0000
committershenshushi <shenshushi@Edk2>2016-01-06 07:40:56 +0000
commit10e547ac2d4cf41df2cef1a7ac5ae45184e57d17 (patch)
tree7ac917926a695562943c5cc48f125da57d336c6a
parentd85509a3218a6b4382822aea25ec125b1b97b3bc (diff)
downloadedk2-10e547ac2d4cf41df2cef1a7ac5ae45184e57d17.tar.gz
edk2-10e547ac2d4cf41df2cef1a7ac5ae45184e57d17.tar.bz2
edk2-10e547ac2d4cf41df2cef1a7ac5ae45184e57d17.zip
ShellPkg: Fix Shell assert when mv a file to a NULL target.
When run command 'mv file ' the Shell assert. The patch refined the length of the buffer to fix this bug. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-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@19607 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
index eb7287e48a..29efb1c6fe 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Mv.c
@@ -2,7 +2,7 @@
Main file for mv shell level 2 function.
(C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
- Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2016, 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
which accompanies this distribution. The full text of the license may be found at
@@ -731,7 +731,7 @@ ShellCommandRunMv (
//
// ValidateAndMoveFiles will report errors to the screen itself
//
- CwdSize = StrSize(ShellGetCurrentDir(NULL)) + 1;
+ CwdSize = StrSize(ShellGetCurrentDir(NULL)) + sizeof(CHAR16);
Cwd = AllocateZeroPool(CwdSize);
ASSERT (Cwd != NULL);
StrCpyS(Cwd, CwdSize/sizeof(CHAR16), ShellGetCurrentDir(NULL));