{\r
ASSERT (Buffer != NULL);\r
ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
- ASSERT ((((UINTN)Buffer) & 1) != 0);\r
- ASSERT ((Length & 1) != 0);\r
+ ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) != 0);\r
+ ASSERT ((Length & (sizeof (Value) - 1)) != 0);\r
\r
if ((Length /= sizeof (Value)) == 0) {\r
return Buffer;\r