1 files changed, 7 insertions, 1 deletions
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
index 5642f6ff5..00fe3ad92 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
@@ -1,6 +1,7 @@
 /** @file
   Main file for DmpStore shell Debug1 function.
-
+   
+  (C) Copyright 2013-2014, Hewlett-Packard Development Company, L.P.
   Copyright (c) 2005 - 2014, 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
@@ -430,6 +431,11 @@ CascadeProcessVariables (
   //
   ShellStatus = CascadeProcessVariables(Name, Guid, Type, FileHandle, FoundVarName, FoundVarGuid, FoundOne);
 
+  if (ShellGetExecutionBreakFlag() || (ShellStatus == SHELL_ABORTED)) {
+    SHELL_FREE_NON_NULL(FoundVarName);
+    return (SHELL_ABORTED);
+  }
+
   //
   // No matter what happened we process our own variable
   // Only continue if Guid and VariableName are each either NULL or a match