From f0480ecf804ff9e0e5c12d21ba563f73212028e8 Mon Sep 17 00:00:00 2001
From: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 10 Mar 2009 08:40:29 +0000
Subject: Fix K8 check error.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7849 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../FaultTolerantWriteDxe/FaultTolerantWrite.c         | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'MdeModulePkg/Universal/FaultTolerantWriteDxe')

diff --git a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c
index d31eaaa66a..53352881c4 100644
--- a/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c
+++ b/MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWrite.c
@@ -451,7 +451,9 @@ FtwWrite (
   Record->Offset  = Offset;
   Record->Length  = Length;
   Record->FvBaseAddress = FvbPhysicalAddress;
-  CopyMem ((Record + 1), PrivateData, Header->PrivateDataSize);
+  if (PrivateData != NULL) {
+    CopyMem ((Record + 1), PrivateData, Header->PrivateDataSize);
+  }
 
   MyOffset  = (UINT8 *) Record - FtwDevice->FtwWorkSpace;
   MyLength  = RECORD_SIZE (Header->PrivateDataSize);
@@ -828,22 +830,14 @@ FtwGetLastWrite (
   // If this record SpareComplete has not set, then it can not restart.
   //
   if (Record->SpareComplete != FTW_VALID_STATE) {
-    if (IsFirstRecordOfWrites (Header, Record)) {
-      //
-      // The First record cannot be restart and target is still healthy,
-      // so abort() is a safe solution.
-      //
+    Status = GetPreviousRecordOfWrites (Header, &Record);
+    if (EFI_ERROR (Status)) {
       FtwAbort (This);
-
       *Complete = TRUE;
       return EFI_NOT_FOUND;
-    } else {
-      //
-      // Step back to the previous record
-      //
-      GetPreviousRecordOfWrites (Header, &Record);
     }
   }
+
   //
   // Fill all the requested values
   //
-- 
cgit v1.2.3