From 7dd62c4e8bcdb8f68d6ab765ca3f411489e71958 Mon Sep 17 00:00:00 2001 From: Jeff Fan Date: Thu, 4 Jun 2015 05:34:46 +0000 Subject: [PATCH] SourceLevelDebugPkg/DebugAgent: Check PcdDebugPortHandleBufferSize Check PcdDebugPortHandleBufferSize before allocate buffer. PeriodicMode is BOOLEAN type, needn't to use == TRUE in if condition. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jeff Fan Reviewed-by: Jaben Carsey git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17558 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c | 2 +- .../Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c b/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c index fba41eecb7..20b6a370d6 100644 --- a/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c +++ b/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c @@ -657,7 +657,7 @@ InitializeDebugAgentPhase2 ( MailboxLocation = GetLocationSavedMailboxPointerInIdtEntry (); Mailbox = (DEBUG_AGENT_MAILBOX *)(UINTN)(*MailboxLocation); BufferSize = PcdGet16(PcdDebugPortHandleBufferSize); - if (Phase2Context->InitFlag == DEBUG_AGENT_INIT_PEI) { + if (Phase2Context->InitFlag == DEBUG_AGENT_INIT_PEI && BufferSize != 0) { NewDebugPortHandle = (UINT64)(UINTN)AllocateCopyPool (BufferSize, DebugPortHandle); } else { NewDebugPortHandle = (UINT64)(UINTN)DebugPortHandle; diff --git a/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c b/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c index 72db534844..4e4e1f536c 100644 --- a/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c +++ b/SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgent/SmmDebugAgentLib.c @@ -282,7 +282,7 @@ InitializeDebugAgent ( // GetApicTimerState (NULL, &PeriodicMode, NULL); TimerCycle = GetApicTimerInitCount (); - if (PeriodicMode != TRUE || TimerCycle == 0) { + if (!PeriodicMode || TimerCycle == 0) { InitializeDebugTimer (NULL, FALSE); DisableApicTimerInterrupt (); } -- 2.39.2