From 1ee3e26b9474444603a36fc740702c80927ca8d1 Mon Sep 17 00:00:00 2001
From: yshang1 <yshang1@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 15 Jun 2006 02:54:27 +0000
Subject: [PATCH] git-svn-id:
 https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@520
 6f19259b-4bc3-4df7-8a09-765794883524

---
 MdePkg/Library/BaseMemoryLib/SetMemWrapper.c       | 5 ++++-
 MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c    | 5 ++++-
 MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c | 5 ++++-
 MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c   | 5 ++++-
 MdePkg/Library/PeiMemoryLib/SetMemWrapper.c        | 5 ++++-
 MdePkg/Library/UefiMemoryLib/SetMemWrapper.c       | 5 ++++-
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
index 294a27a753..0600dc289f 100644
--- a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
@@ -47,6 +47,9 @@ SetMem (
   IN      UINT8                     Value
   )
 {
-  ASSERT (Size <= MAX_ADDRESS - (UINTN)Buffer + 1);
+  if (Size == 0) {
+    return Buffer;
+  }
+  ASSERT (Size - 1 <= MAX_ADDRESS - (UINTN)Buffer);
   return InternalMemSetMem (Buffer, Size, Value);
 }
diff --git a/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c
index 294a27a753..0600dc289f 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c
@@ -47,6 +47,9 @@ SetMem (
   IN      UINT8                     Value
   )
 {
-  ASSERT (Size <= MAX_ADDRESS - (UINTN)Buffer + 1);
+  if (Size == 0) {
+    return Buffer;
+  }
+  ASSERT (Size - 1 <= MAX_ADDRESS - (UINTN)Buffer);
   return InternalMemSetMem (Buffer, Size, Value);
 }
diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
index 294a27a753..0600dc289f 100644
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
@@ -47,6 +47,9 @@ SetMem (
   IN      UINT8                     Value
   )
 {
-  ASSERT (Size <= MAX_ADDRESS - (UINTN)Buffer + 1);
+  if (Size == 0) {
+    return Buffer;
+  }
+  ASSERT (Size - 1 <= MAX_ADDRESS - (UINTN)Buffer);
   return InternalMemSetMem (Buffer, Size, Value);
 }
diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
index 294a27a753..0600dc289f 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
@@ -47,6 +47,9 @@ SetMem (
   IN      UINT8                     Value
   )
 {
-  ASSERT (Size <= MAX_ADDRESS - (UINTN)Buffer + 1);
+  if (Size == 0) {
+    return Buffer;
+  }
+  ASSERT (Size - 1 <= MAX_ADDRESS - (UINTN)Buffer);
   return InternalMemSetMem (Buffer, Size, Value);
 }
diff --git a/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c b/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
index 294a27a753..0600dc289f 100644
--- a/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
@@ -47,6 +47,9 @@ SetMem (
   IN      UINT8                     Value
   )
 {
-  ASSERT (Size <= MAX_ADDRESS - (UINTN)Buffer + 1);
+  if (Size == 0) {
+    return Buffer;
+  }
+  ASSERT (Size - 1 <= MAX_ADDRESS - (UINTN)Buffer);
   return InternalMemSetMem (Buffer, Size, Value);
 }
diff --git a/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c b/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c
index 294a27a753..0600dc289f 100644
--- a/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c
@@ -47,6 +47,9 @@ SetMem (
   IN      UINT8                     Value
   )
 {
-  ASSERT (Size <= MAX_ADDRESS - (UINTN)Buffer + 1);
+  if (Size == 0) {
+    return Buffer;
+  }
+  ASSERT (Size - 1 <= MAX_ADDRESS - (UINTN)Buffer);
   return InternalMemSetMem (Buffer, Size, Value);
 }
-- 
2.39.2