From 533f039eb0bd2a1d5e7f11debb1379b048630021 Mon Sep 17 00:00:00 2001 From: qhuang8 Date: Wed, 7 Jun 2006 15:38:52 +0000 Subject: BaseMemoryLib: Correct wrong ASSERT()s on SetMem16(), SetMem32(), SetMem64() HobLib: Add Missing ASSERT()s for BuildGuidHobData() since CopyMem() now allow zero source buffer with length > 0. BasePrintLib Add ASSERT()s to check NULL buffer and NULL format. PostCodeLib Add 3 instances of PostCodeLib and introduce new Pcd for post code property mask. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@438 6f19259b-4bc3-4df7-8a09-765794883524 --- MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c | 6 +++--- MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c | 6 +++--- MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'MdePkg/Library/BaseMemoryLib') diff --git a/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c index 3acbdac436..dea31608fe 100644 --- a/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c +++ b/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c @@ -52,10 +52,10 @@ SetMem16 ( IN UINT16 Value ) { - ASSERT (Buffer != NULL); + ASSERT (!(Buffer == NULL && Length > 0)); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); - ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0); - ASSERT ((Length & (sizeof (Value) - 1)) != 0); + ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) == 0); + ASSERT ((Length & (sizeof (Value) - 1)) == 0); if ((Length /= sizeof (Value)) == 0) { return Buffer; diff --git a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c index 620b69aef4..1ae7acb013 100644 --- a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c +++ b/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c @@ -52,10 +52,10 @@ SetMem32 ( IN UINT32 Value ) { - ASSERT (Buffer != NULL); + ASSERT (!(Buffer == NULL && Length > 0)); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); - ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0); - ASSERT ((Length & (sizeof (Value) - 1)) != 0); + ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) == 0); + ASSERT ((Length & (sizeof (Value) - 1)) == 0); if ((Length /= sizeof (Value)) == 0) { return Buffer; diff --git a/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c index 73c28af4a1..0128a2d6f1 100644 --- a/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c +++ b/MdePkg/Library/BaseMemoryLib/SetMem64Wrapper.c @@ -52,10 +52,10 @@ SetMem64 ( IN UINT64 Value ) { - ASSERT (Buffer != NULL); + ASSERT (!(Buffer == NULL && Length > 0)); ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1); - ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0); - ASSERT ((Length & (sizeof (Value) - 1)) != 0); + ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) == 0); + ASSERT ((Length & (sizeof (Value) - 1)) == 0); if ((Length /= sizeof (Value)) == 0) { return Buffer; -- cgit v1.2.3