X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdePkg%2FLibrary%2FBaseMemoryLib%2FSetMem16Wrapper.c;h=889339c9533d9822a5d3f47af818b3d47ee33ea4;hb=003673f507cdc01edfb9f6af45094dad8ff09b36;hp=dea31608fe3d3ee98298101a80d0ef8cb12ce1c5;hpb=533f039eb0bd2a1d5e7f11debb1379b048630021;p=mirror_edk2.git

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
index dea31608fe..889339c953 100644
--- a/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem16Wrapper.c
@@ -19,7 +19,7 @@
     BaseMemoryLibSse2
     BaseMemoryLibRepStr
     PeiMemoryLib
-    UefiMemoryLib
+    DxeMemoryLib
 
 **/
 
@@ -32,7 +32,7 @@
   Value, and returns Buffer. Value is repeated every 16-bits in for Length
   bytes of Buffer.
 
-  If Buffer is NULL and Length > 0, then ASSERT().
+  If Length > 0 and Buffer is NULL, then ASSERT().
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().
   If Length is not aligned on a 16-bit boundary, then ASSERT().
@@ -41,24 +41,25 @@
   @param  Length  Number of bytes in Buffer to fill.
   @param  Value   Value with which to fill Length bytes of Buffer.
 
-  @return Buffer
+  @return Buffer.
 
 **/
 VOID *
 EFIAPI
 SetMem16 (
-  OUT     VOID                      *Buffer,
-  IN      UINTN                     Length,
-  IN      UINT16                    Value
+  OUT VOID   *Buffer,
+  IN UINTN   Length,
+  IN UINT16  Value
   )
 {
-  ASSERT (!(Buffer == NULL && Length > 0));
-  ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);
+  if (Length == 0) {
+    return Buffer;
+  }
+
+  ASSERT (Buffer != NULL);
+  ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));
   ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) == 0);
   ASSERT ((Length & (sizeof (Value) - 1)) == 0);
 
-  if ((Length /= sizeof (Value)) == 0) {
-    return Buffer;
-  }
-  return InternalMemSetMem16 (Buffer, Length, Value);
+  return InternalMemSetMem16 (Buffer, Length / sizeof (Value), Value);
 }