tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "fortify: simplify strlen for LLVM's new optimization" am: db5c45b457

Browse source 
Change-Id: I9a954bfdbccdd2e53dd0e88cfb7fe0d8fc80a226
This commit is contained in:
Automerger Merge Worker 2020-02-19 18:32:09 +00:00
commit 1ccba9f0fe
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libc/include/bits/fortify/string.h
View file

@ -204,21 +204,17 @@ size_t strlcat(char* const dst __pass_object_size, const char* src, size_t size)
"'strlcat' called with size bigger than buffer") {
#if __ANDROID_API__ >= 17 && __BIONIC_FORTIFY_RUNTIME_CHECKS_ENABLED
return __strlcat_chk(dst, src, size, __bos(dst));
#endif
#else
return __call_bypassing_fortify(strlcat)(dst, src, size);
#endif
}
#if __ANDROID_API__ >= 17 && __BIONIC_FORTIFY_RUNTIME_CHECKS_ENABLED
__BIONIC_FORTIFY_INLINE
size_t strlen(const char* const s __pass_object_size0) __overloadable {
#if __ANDROID_API__ >= 17 && __BIONIC_FORTIFY_RUNTIME_CHECKS_ENABLED
size_t bos = __bos0(s);
if (!__bos_trivially_gt(bos, __builtin_strlen(s))) {
return __strlen_chk(s, bos);
}
#endif
return __builtin_strlen(s);
return __strlen_chk(s, __bos0(s));
}
#endif
__BIONIC_FORTIFY_INLINE
char* strchr(const char* const s __pass_object_size, int c) __overloadable {