From 668a5781d3b3262cf51b47a27b43cc201c390bbc Mon Sep 17 00:00:00 2001
From: jcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 13 Feb 2013 22:22:16 +0000
Subject: ShellPkg: add verification that a target directory exists when
 changing directory with drive identifier.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
reviewed-by: Erik Bjorge <erik.c.bjorge@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14128 6f19259b-4bc3-4df7-8a09-765794883524
---
 ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c')

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c
index 74beb093c..c0d3c920f 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cd.c
@@ -1,7 +1,7 @@
 /** @file
   Main file for attrib shell level 2 function.
 
-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2013, 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
@@ -149,6 +149,9 @@ ShellCommandRunCd (
             }
           }
         } else if (StrStr(Param1Copy, L":") == NULL) {
+          //
+          // change directory without a drive identifier
+          //
           if (ShellGetCurrentDir(NULL) == NULL) {
             ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_CWD), gShellLevel2HiiHandle);
             ShellStatus = SHELL_NOT_FOUND;
@@ -189,7 +192,7 @@ ShellCommandRunCd (
           }
         } else {
           //
-          // change directory on other drive letter
+          // change directory with a drive letter
           //
           Drive = AllocateZeroPool(StrSize(Param1Copy));
           if (Drive == NULL) {
@@ -199,7 +202,10 @@ ShellCommandRunCd (
             Drive = StrCpy(Drive, Param1Copy);
             Path = StrStr(Drive, L":");
             ASSERT(Path != NULL);
-            if (*(Path+1) == CHAR_NULL) {
+            if (EFI_ERROR(ShellIsDirectory(Param1Copy))) {
+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NOT_DIR), gShellLevel2HiiHandle, Param1Copy);
+              ShellStatus = SHELL_NOT_FOUND;
+            } else if (*(Path+1) == CHAR_NULL) {
               ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_CD_NF), gShellLevel2HiiHandle);
               ShellStatus = SHELL_NOT_FOUND;
             } else {
-- 
cgit v1.2.3