MdePkg/BaseMemoryLib*: check for zero length in ZeroMem ()

[mirror_edk2.git] / MdePkg / Library / PeiMemoryLib / ZeroMemWrapper.c

diff --git a/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
index 5adddbbfad66aba7a7374c652ecc5766ad08af3d..a3aa7d10a689f53ec95fc196aec1faa721c1383d 100644 (file)
--- a/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
+++ b/MdePkg/Library/PeiMemoryLib/ZeroMemWrapper.c
@@ -46,7 +46,11 @@ ZeroMem (
   IN UINTN  Length\r
   )\r
 {\r
-  ASSERT (!(Buffer == NULL && Length > 0));\r
+  if (Length == 0) {\r
+    return Buffer;\r
+  }\r
+\r
+  ASSERT (Buffer != NULL);\r
   ASSERT (Length <= (MAX_ADDRESS - (UINTN)Buffer + 1));\r
   return InternalMemZeroMem (Buffer, Length);\r
 }\r