From 8bd282bee9909a0ac414f11c9274c473dbb9a538 Mon Sep 17 00:00:00 2001
From: jcarsey <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 27 Jun 2011 16:45:41 +0000
Subject: [PATCH] allow for failure return when called without a shell present.

signed-off-by: jcarsey
reviewed-by: lgrosenb

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

diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
index d65f427cee..6d885f4681 100644
--- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c
+++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c
@@ -1214,10 +1214,13 @@ ShellGetCurrentDir (
     return (mEfiShellProtocol->GetCurDir(DeviceName));
   }
   //
-  // ASSERT that we must have EFI shell
+  // Check for EFI shell
   //
-  ASSERT(mEfiShellEnvironment2 != NULL);
-  return (mEfiShellEnvironment2->CurDir(DeviceName));
+  if (mEfiShellEnvironment2 != NULL) {
+    return (mEfiShellEnvironment2->CurDir(DeviceName));
+  }
+
+  return (NULL);
 }
 /**
   sets (enabled or disabled) the page break mode
-- 
2.39.2