X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdePkg%2FLibrary%2FBaseMemoryLibMmx%2FScanMem16Wrapper.c;h=d746c8fc606bebf2c2d0e46540b8fac2c87099ea;hb=38bbd3d91c38481d18c1a7e2049473c951ee98ed;hp=d336d596417296689b28788b30121c72805e729d;hpb=4ba61e5e2a1b3cec7faaad36c252738f6f57f8a6;p=mirror_edk2.git

diff --git a/MdePkg/Library/BaseMemoryLibMmx/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/ScanMem16Wrapper.c
index d336d59641..d746c8fc60 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/ScanMem16Wrapper.c
@@ -19,7 +19,7 @@
     BaseMemoryLibSse2
     BaseMemoryLibRepStr
     PeiMemoryLib
-    UefiMemoryLib
+    DxeMemoryLib
 
 **/
 
@@ -35,7 +35,8 @@
   then NULL is returned.  If Length is 0, then NULL is returned.
   If Length > 0 and Buffer is NULL, then ASSERT().
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().
-  If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 
+  If Length is not aligned on a 16-bit boundary, then ASSERT().
+  If Length is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 
 
   @param  Buffer      Pointer to the target buffer to scan.
   @param  Length      Number of bytes in Buffer to scan.
@@ -47,18 +48,19 @@
 VOID *
 EFIAPI
 ScanMem16 (
-  IN      CONST VOID                *Buffer,
-  IN      UINTN                     Length,
-  IN      UINT16                    Value
+  IN CONST VOID  *Buffer,
+  IN UINTN       Length,
+  IN UINT16      Value
   )
 {
-  if (Length == 0) {
+  if (0 == Length) {
     return NULL;
   }
 
   ASSERT (Buffer != NULL);
   ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));
+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);
 
   return (VOID*)InternalMemScanMem16 (Buffer, Length / sizeof (Value), Value);
 }