From d339cd2085cd931d95212b1644b7ba781dae85b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marvin=20H=C3=A4user?= <8659494+mhaeuser@users.noreply.github.com> Date: Tue, 2 Mar 2021 15:31:53 +0100 Subject: [PATCH] OpenCanopy: Statically construct GOP content to match pointer context --- Platform/OpenCanopy/Output/OutputStGop.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Platform/OpenCanopy/Output/OutputStGop.c b/Platform/OpenCanopy/Output/OutputStGop.c index 16336e55..48ec9a86 100644 --- a/Platform/OpenCanopy/Output/OutputStGop.c +++ b/Platform/OpenCanopy/Output/OutputStGop.c @@ -48,7 +48,9 @@ GuiOutputConstruct ( VOID ) { - GUI_OUTPUT_CONTEXT *Context; + // TODO: alloc on the fly? + STATIC GUI_OUTPUT_CONTEXT Context; + EFI_GRAPHICS_OUTPUT_PROTOCOL *Gop; Gop = InternalGuiOutputLocateGop(); @@ -56,13 +58,8 @@ GuiOutputConstruct ( return NULL; } - Context = AllocatePool (sizeof (*Context)); - if (Context == NULL) { - return NULL; - } - - Context->Gop = Gop; - return Context; + Context.Gop = Gop; + return &Context; } EFI_STATUS @@ -108,5 +105,5 @@ GuiOutputDestruct ( ) { ASSERT (Context != NULL); - FreePool (Context); + ZeroMem (Context, sizeof (*Context)); }