1 files changed, 3 insertions, 1 deletions
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c b/ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c
index 4de55d8457..c046b8be86 100644
--- a/ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c
@@ -1,6 +1,7 @@
 //------------------------------------------------------------------------------
 //
 // Copyright (c) 2017, Pete Batard. All rights reserved.<BR>
+// Copyright (c) 2021, Arm Limited. All rights reserved.<BR>
 //
 // SPDX-License-Identifier: BSD-2-Clause-Patent
 //
@@ -19,8 +20,9 @@ void *memset(void *s, int c, size_t n)
 {
   unsigned char *d = s;
 
-  while (n--)
+  while (n-- != 0) {
     *d++ = (unsigned char)c;
+  }
 
   return s;
 }