From 960729473e14c847526af94c430bc38f93105ec7 Mon Sep 17 00:00:00 2001
From: jyao1 <jyao1@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 14 Nov 2011 06:28:40 +0000
Subject: Follow PI1.2c spec, check empty string and return
 EFI_INVALID_PARAMETER. Clean up comment according to PI1.2c spec.

signed-off-by: jyao1
reviewed-by: rsun3

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12690 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c  | 12 +++++++++---
 MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c    |  6 ++++--
 MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c |  6 ++++--
 3 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'MdeModulePkg')

diff --git a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
index 8769509f76..aa20d6d302 100644
--- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
+++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/BootScriptSave.c
@@ -1,7 +1,7 @@
 /** @file
   Save the S3 data to S3 boot script. 
  
-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions
@@ -1754,9 +1754,15 @@ S3BootScriptLabel (
   EFI_BOOT_SCRIPT_TABLE_HEADER   TableHeader;
   UINT32                         LabelLength;
   //
-  // Assume Label is not NULL
+  // Check NULL Label
   //
- if (Label == NULL) {
+  if (Label == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+  //
+  // Check empty Label
+  //
+  if (Label[0] == '\0') {
     return EFI_INVALID_PARAMETER;
   }
   
diff --git a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
index 15c4b6b90f..249fb8caff 100644
--- a/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
+++ b/MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveState.c
@@ -1,7 +1,7 @@
 /** @file
   Implementation for S3 Boot Script Saver state driver.
 
-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions
@@ -827,7 +827,8 @@ BootScriptInsert (
   @param  Label                 Points to the label which will be inserted in the boot script table.
 
   @retval EFI_SUCCESS           The label already exists or was inserted.
-  @retval EFI_INVALID_PARAMETER The Opcode is an invalid opcode value or the Position is not a valid position in the boot script table..
+  @retval EFI_INVALID_PARAMETER The Label is NULL or points to an empty string.
+  @retval EFI_INVALID_PARAMETER The Position is not a valid position in the boot script table.
   
 **/
 EFI_STATUS
@@ -856,6 +857,7 @@ BootScriptLabel (
 
   @retval EFI_SUCCESS           The operation succeeded. 
   @retval EFI_INVALID_PARAMETER The Position1 or Position2 is not a valid position in the boot script table.
+  @retval EFI_INVALID_PARAMETER The RelativePosition is NULL.
 
 **/
 EFI_STATUS
diff --git a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
index 9879143e4b..d0652d3fd8 100644
--- a/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
+++ b/MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.c
@@ -1,7 +1,7 @@
 /** @file
   Implementation for S3 SMM Boot Script Saver state driver.
 
-  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
 
   This program and the accompanying materials
   are licensed and made available under the terms and conditions
@@ -825,7 +825,8 @@ BootScriptInsert (
   @param  Label                 Points to the label which will be inserted in the boot script table.
 
   @retval EFI_SUCCESS           The label already exists or was inserted.
-  @retval EFI_INVALID_PARAMETER The Opcode is an invalid opcode value or the Position is not a valid position in the boot script table..
+  @retval EFI_INVALID_PARAMETER The Label is NULL or points to an empty string.
+  @retval EFI_INVALID_PARAMETER The Position is not a valid position in the boot script table.
   
 **/
 EFI_STATUS
@@ -854,6 +855,7 @@ BootScriptLabel (
 
   @retval EFI_SUCCESS           The operation succeeded. 
   @retval EFI_INVALID_PARAMETER The Position1 or Position2 is not a valid position in the boot script table.
+  @retval EFI_INVALID_PARAMETER The RelativePosition is NULL.
 
 **/
 EFI_STATUS
-- 
cgit v1.2.3