From: Shumin Qiu <shumin.qiu@intel.com>
Date: Tue, 7 Jan 2014 01:51:08 +0000 (+0000)
Subject: Add the comment for function 'IsValidSplit' in 'Shell.c'. Add code to check whether... 
X-Git-Tag: edk2-stable201903~11906
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=de4ebdcfcdc3c9949295d0a0bc72015a4e2f61fe

Add the comment for function 'IsValidSplit' in 'Shell.c'. Add code to check whether pointer 'DataBuffer' in 'DmpStore.c' is NULL before used.

Signed-off-by: Shumin Qiu <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@15051 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c
index ea142023d2..44469baaed 100644
--- a/ShellPkg/Application/Shell/Shell.c
+++ b/ShellPkg/Application/Shell/Shell.c
@@ -1,7 +1,7 @@
 /** @file
   This is THE shell (application)
 
-  Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
   Copyright (c) 2013, Hewlett-Packard Development Company, L.P.
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
@@ -1593,6 +1593,15 @@ GetOperationType(
   return (Unknown_Invalid);
 }
 
+/**
+  Determine if the first item in a command line is valid.
+
+  @param[in] CmdLine            The command line to parse.
+
+  @retval EFI_SUCCESS           The item is valid.
+  @retval EFI_OUT_OF_RESOURCES  A memory allocation failed.
+  @retval EFI_NOT_FOUND         The operation type is unknown or invalid.
+**/
 EFI_STATUS 
 EFIAPI
 IsValidSplit(
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
index fd10967964..afeedb0959 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c
@@ -1,7 +1,7 @@
 /** @file
   Main file for DmpStore shell Debug1 function.
 
-  Copyright (c) 2005 - 2013, Intel Corporation. All rights reserved.<BR>
+  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
   which accompanies this distribution.  The full text of the license may be found at
@@ -173,7 +173,7 @@ CascadeProcessVariables (
       //
       // Last error check then print this variable out.
       //
-      if (!EFI_ERROR(Status)) {
+      if (!EFI_ERROR(Status) && DataBuffer != NULL) {
         RetString = GetAttrType(Atts);
         ShellPrintHiiEx(
           -1,