git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@520 6f19259b...

diff --git a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
index 294a27a75362e6b9286b93e30c695e4cd93c33ba..0600dc289fb45c4496d3a16d7f56a3d33631d398 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMemWrapper.c
@@ -47,6 +47,9 @@ SetMem (
   IN      UINT8                     Value\r
   )\r
 {\r
-  ASSERT (Size <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
+  if (Size == 0) {\r
+    return Buffer;\r
+  }\r
+  ASSERT (Size - 1 <= MAX_ADDRESS - (UINTN)Buffer);\r
   return InternalMemSetMem (Buffer, Size, Value);\r
 }\r

diff --git a/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c
index 294a27a75362e6b9286b93e30c695e4cd93c33ba..0600dc289fb45c4496d3a16d7f56a3d33631d398 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c
@@ -47,6 +47,9 @@ SetMem (
   IN      UINT8                     Value\r
   )\r
 {\r
-  ASSERT (Size <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
+  if (Size == 0) {\r
+    return Buffer;\r
+  }\r
+  ASSERT (Size - 1 <= MAX_ADDRESS - (UINTN)Buffer);\r
   return InternalMemSetMem (Buffer, Size, Value);\r
 }\r

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
index 294a27a75362e6b9286b93e30c695e4cd93c33ba..0600dc289fb45c4496d3a16d7f56a3d33631d398 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c
@@ -47,6 +47,9 @@ SetMem (
   IN      UINT8                     Value\r
   )\r
 {\r
-  ASSERT (Size <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
+  if (Size == 0) {\r
+    return Buffer;\r
+  }\r
+  ASSERT (Size - 1 <= MAX_ADDRESS - (UINTN)Buffer);\r
   return InternalMemSetMem (Buffer, Size, Value);\r
 }\r

diff --git a/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c b/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
index 294a27a75362e6b9286b93e30c695e4cd93c33ba..0600dc289fb45c4496d3a16d7f56a3d33631d398 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c
@@ -47,6 +47,9 @@ SetMem (
   IN      UINT8                     Value\r
   )\r
 {\r
-  ASSERT (Size <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
+  if (Size == 0) {\r
+    return Buffer;\r
+  }\r
+  ASSERT (Size - 1 <= MAX_ADDRESS - (UINTN)Buffer);\r
   return InternalMemSetMem (Buffer, Size, Value);\r
 }\r

diff --git a/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c b/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
index 294a27a75362e6b9286b93e30c695e4cd93c33ba..0600dc289fb45c4496d3a16d7f56a3d33631d398 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/SetMemWrapper.c
@@ -47,6 +47,9 @@ SetMem (
   IN      UINT8                     Value\r
   )\r
 {\r
-  ASSERT (Size <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
+  if (Size == 0) {\r
+    return Buffer;\r
+  }\r
+  ASSERT (Size - 1 <= MAX_ADDRESS - (UINTN)Buffer);\r
   return InternalMemSetMem (Buffer, Size, Value);\r
 }\r

diff --git a/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c b/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c
index 294a27a75362e6b9286b93e30c695e4cd93c33ba..0600dc289fb45c4496d3a16d7f56a3d33631d398 100644 (file)
--- a/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c
+++ b/MdePkg/Library/UefiMemoryLib/SetMemWrapper.c
@@ -47,6 +47,9 @@ SetMem (
   IN      UINT8                     Value\r
   )\r
 {\r
-  ASSERT (Size <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
+  if (Size == 0) {\r
+    return Buffer;\r
+  }\r
+  ASSERT (Size - 1 <= MAX_ADDRESS - (UINTN)Buffer);\r
   return InternalMemSetMem (Buffer, Size, Value);\r
 }\r