MdePkg/BaseMemoryLib: Fix VS2015 build error

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

diff --git a/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c b/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
index 89520348bad2aefaadd92e51f8806ea8bba44f05..9dd0b45e188e5cbb668f75132dc5e8bbd35417e6 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/ZeroMemWrapper.c
@@ -12,11 +12,11 @@
     PeiMemoryLib\r
     UefiMemoryLib\r
     \r
-  Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
+  http://opensource.org/licenses/bsd-license.php.\r
 \r
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
@@ -33,8 +33,8 @@
   If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
 \r
-  @param  Buffer      Pointer to the target buffer to fill with zeros.\r
-  @param  Length      Number of bytes in Buffer to fill with zeros.\r
+  @param  Buffer      The pointer to the target buffer to fill with zeros.\r
+  @param  Length      The number of bytes in Buffer to fill with zeros.\r
 \r
   @return Buffer.\r
 \r
@@ -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