From 1d5b25b7159f87612181c00b8be9ae6404d37168 Mon Sep 17 00:00:00 2001 From: eric_tian Date: Tue, 11 Aug 2009 05:24:12 +0000 Subject: [PATCH] add condition judgment to avoid accessing NULL address if not found existing variable. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9038 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c index dddc143751..228d7d8cff 100644 --- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c +++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c @@ -618,7 +618,7 @@ UpdateVariable ( UINTN VarDataOffset; UINTN VarSize; VARIABLE_GLOBAL *Global; - UINTN NonVolatileVarableStoreSize; + UINTN NonVolatileVarableStoreSize; Global = &mVariableModuleGlobal->VariableGlobal[Physical]; @@ -767,7 +767,9 @@ UpdateVariable ( // // Mark the old variable as deleted // - Variable->CurrPtr->State &= VAR_DELETED; + if (Variable->CurrPtr != NULL) { + Variable->CurrPtr->State &= VAR_DELETED; + } UpdateVariableInfo (VariableName, VendorGuid, Variable->Volatile, FALSE, TRUE, FALSE, FALSE); -- 2.39.2