From 983ae8cee2db3a26ac977753fba56fee5acee6a6 Mon Sep 17 00:00:00 2001 From: lgao4 Date: Thu, 22 Apr 2010 02:59:29 +0000 Subject: [PATCH] Add the correct check for the return value before use them. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10396 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c | 1 + EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c | 1 + .../SmmBaseOnSmmBase2Thunk/SmmBaseOnSmmBase2Thunk.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c index bf05852647..c26862e043 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c @@ -570,6 +570,7 @@ HiiThunkUpdateForm ( if (Data->DataCount != 0) { ThunkContext = UefiHiiHandleToThunkContext (Private, UefiHiiHandle); + ASSERT (ThunkContext != NULL); Status = FwUpdateDataToUefiUpdateData (ThunkContext, Data, StartOpCodeHandle); ASSERT_EFI_ERROR (Status); diff --git a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c index e491a946ca..e447dd96ca 100644 --- a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c +++ b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c @@ -422,6 +422,7 @@ InitCpuStatePageTable ( } else { ASSERT ((Pde & mPhyMask) == (HookAddress & ~(SIZE_2MB-1))); // 2MB Page Point to HookAddress PageTable = AllocatePages (1); + ASSERT (PageTable != NULL); Address = HookAddress & ~(SIZE_2MB-1); for (Index = 0; Index < 512; Index++) { PageTable[Index] = Address | BIT0 | BIT1; // Present and RW diff --git a/EdkCompatibilityPkg/Compatibility/SmmBaseOnSmmBase2Thunk/SmmBaseOnSmmBase2Thunk.c b/EdkCompatibilityPkg/Compatibility/SmmBaseOnSmmBase2Thunk/SmmBaseOnSmmBase2Thunk.c index 4834036a6b..ce491a747f 100644 --- a/EdkCompatibilityPkg/Compatibility/SmmBaseOnSmmBase2Thunk/SmmBaseOnSmmBase2Thunk.c +++ b/EdkCompatibilityPkg/Compatibility/SmmBaseOnSmmBase2Thunk/SmmBaseOnSmmBase2Thunk.c @@ -470,7 +470,7 @@ SmmBaseThunkMain ( // Assume only one instance of SMM Communication Protocol in the system // Locate SMM Communication Protocol // - gBS->LocateProtocol (&gEfiSmmCommunicationProtocolGuid, NULL, (VOID **) &mSmmCommunication); + Status = gBS->LocateProtocol (&gEfiSmmCommunicationProtocolGuid, NULL, (VOID **) &mSmmCommunication); ASSERT_EFI_ERROR (Status); // -- 2.39.2