commit dbfb452b25333deab1985ce18eed799cfcdee923
author Nick Kralevich <nnk@google.com> Thu Aug 27 20:36:08 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 27 20:36:08 2015 +0000
tree 5e7ac86fef5da639d28b286d8aa6ef7730756598
parent ff8b03972f1931340e64cc0e9d8b6eb08cecade9
parent d84b77ff3fa67896bf44a563b2324e8ad5207729

Merge "android_memset.c: Use __attribute__((no_sanitize("integer")))"

libcutils/arch-mips/android_memset.c

diff --git a/libcutils/arch-mips/android_memset.c b/libcutils/arch-mips/android_memset.c
index a6b7496..4164c2a 100644
--- a/libcutils/arch-mips/android_memset.c
+++ b/libcutils/arch-mips/android_memset.c
@@ -30,6 +30,9 @@
 
 #include <cutils/memory.h>
 
+#ifdef __clang__
+__attribute__((no_sanitize("integer")))
+#endif
 void android_memset16(uint16_t* dst, uint16_t value, size_t size)
 {
    /* optimized version of
@@ -54,6 +57,9 @@
 }
 
 
+#ifdef __clang__
+__attribute__((no_sanitize("integer")))
+#endif
 void android_memset32(uint32_t* dst, uint32_t value, size_t size)
 {
    /* optimized version of
@@ -86,7 +92,8 @@
 
    /* fill remainder with original 32-bit single-elem loop */
    dst = (uint32_t*) dst64;
-   while (size--) {
+   while (size != 0) {
+       size--;
       *dst++ = value;
    }