commit bc37c5a8ce8e4131d98e4afb9800a98c1f929a60
author George Burgess IV <gbiv@google.com> Wed Sep 18 17:01:31 2019 -0700
committer George Burgess IV <gbiv@google.com> Mon Sep 30 13:00:35 2019 -0700
tree b94fe730ae94339db1ee570c51d3a671f8e0197c
parent d0a0f72852d45db213886db606692e7b204207bc

fortify(strings): emit diagnostics regardless of API level

Bug: 141267932
Test: m checkbuild on internal-master

Change-Id: Ief185320f93ec31f4d0a8035c450a7ab7b4e02b4

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) */