commit 013606a758ec21134045b69086fcdf5b636db3af
author George Burgess IV <gbiv@google.com> Tue Oct 01 15:04:01 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Oct 01 15:04:01 2019 -0700
tree 0ee043893741033b532e69e243b5f17dbb29b625
parent 3f469d26d2366301f71d08cdeb3b995b47da59ae
parent 32afb989c2683d4475e3169b89ec0ece919a9184

Merge "fortify(strings): emit diagnostics regardless of API level" am: 822beaeeac
am: 32afb989c2

Change-Id: Ic98aaff18b30b4c94be28806d2d4d4e368803b97

libc/include/bits/fortify/strings.h

diff --git a/libc/include/bits/fortify/strings.h b/libc/include/bits/fortify/strings.h
index 385cf77..cc268db 100644
--- a/libc/include/bits/fortify/strings.h
+++ b/libc/include/bits/fortify/strings.h
@@ -28,18 +28,19 @@
 
 #if defined(__BIONIC_FORTIFY)
 
-#if __ANDROID_API__ >= __ANDROID_API_J_MR1__
 __BIONIC_FORTIFY_INLINE
 void __bionic_bcopy(const void *src, void* const dst __pass_object_size0, size_t len)
         __overloadable
         __clang_error_if(__bos_unevaluated_lt(__bos0(dst), len),
                          "'bcopy' called with size bigger than buffer") {
+#if __ANDROID_API__ >= __ANDROID_API_J_MR1__
     size_t bos = __bos0(dst);
-    if (__bos_trivially_not_lt(bos, len)) {
-        __builtin_memmove(dst, src, len);
-    } else {
+    if (!__bos_trivially_ge(bos, len)) {
         __builtin___memmove_chk(dst, src, len, bos);
+        return;
     }
+#endif /* __ANDROID_API__ >= __ANDROID_API_J_MR1__ */
+    __builtin_memmove(dst, src, len);
 }
 
 __BIONIC_FORTIFY_INLINE
@@ -47,13 +48,14 @@
         __overloadable
         __clang_error_if(__bos_unevaluated_lt(__bos0(b), len),
                          "'bzero' called with size bigger than buffer") {
+#if __ANDROID_API__ >= __ANDROID_API_J_MR1__
     size_t bos = __bos0(b);
-    if (__bos_trivially_not_lt(bos, len)) {
-        __builtin_memset(b, 0, len);
-    } else {
+    if (!__bos_trivially_ge(bos, len)) {
         __builtin___memset_chk(b, 0, len, bos);
+        return;
     }
-}
 #endif /* __ANDROID_API__ >= __ANDROID_API_J_MR1__ */
+    __builtin_memset(b, 0, len);
+}
 
 #endif /* defined(__BIONIC_FORTIFY) */