diff options
author | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-11-23 07:50:31 +0000 |
---|---|---|
committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-11-23 07:50:31 +0000 |
commit | 7b788539217bf9729be00facd66f62bc17091a6e (patch) | |
tree | dd49261ea58a2016056b0a35720d2c4eda045a86 /MdeModulePkg/Library/PeiReportStatusCodeLib | |
parent | da70d025893754f3b02fe066981a270f0e45d9f8 (diff) | |
download | edk2-platforms-7b788539217bf9729be00facd66f62bc17091a6e.tar.xz |
1. Rollback the changing on replacing MAX_EXTENDED_DATA_SIZE by EFI_STATUS_CODE_DATA_MAX_SIZE,
use MAX_EXTENDED_DATA_SIZE as before.
2. Use DEBUG error message instead of ASSERT(FASLE) when extended data is too large
3. Expand 1 for buffer array size to avoid potential issue.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11083 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Library/PeiReportStatusCodeLib')
-rw-r--r-- | MdeModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/MdeModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c b/MdeModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c index 70737ba4f6..d41d4e981d 100644 --- a/MdeModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c +++ b/MdeModulePkg/Library/PeiReportStatusCodeLib/ReportStatusCodeLib.c @@ -23,6 +23,11 @@ #include <Library/OemHookStatusCodeLib.h>
#include <Library/PcdLib.h>
+//
+// Define the maximum extended data size that is supported in the PEI phase
+//
+#define MAX_EXTENDED_DATA_SIZE 0x200
+
/**
Internal worker function that reports a status code through the PEI Status Code Service or
OEM Hook Status Code Library.
@@ -453,7 +458,7 @@ ReportStatusCodeEx ( )
{
EFI_STATUS_CODE_DATA *StatusCodeData;
- UINT64 Buffer[EFI_STATUS_CODE_DATA_MAX_SIZE / sizeof (UINT64)];
+ UINT64 Buffer[(MAX_EXTENDED_DATA_SIZE / sizeof (UINT64)) + 1];
//
// If ExtendedData is NULL and ExtendedDataSize is not zero, then ASSERT().
@@ -464,12 +469,12 @@ ReportStatusCodeEx ( //
ASSERT (!((ExtendedData != NULL) && (ExtendedDataSize == 0)));
- if (ExtendedDataSize > (EFI_STATUS_CODE_DATA_MAX_SIZE - sizeof (EFI_STATUS_CODE_DATA))) {
+ if (ExtendedDataSize > (MAX_EXTENDED_DATA_SIZE - sizeof (EFI_STATUS_CODE_DATA))) {
//
// The local variable Buffer not large enough to hold the extended data associated
// with the status code being reported.
//
- ASSERT (FALSE);
+ DEBUG ((EFI_D_ERROR, "Status code extended data is too large to be reported!\n"));
return EFI_OUT_OF_RESOURCES;
}
StatusCodeData = (EFI_STATUS_CODE_DATA *) Buffer;
|