further cleanup memcpy fortify implementation
Bug: 17784968
(cherry picked from commit b84f667e9312611536a564700daea11c12b6fcfa)
Change-Id: I68fc2cc0a1ee7f0887edf3681eb83ef678de1383
diff --git a/libc/include/string.h b/libc/include/string.h
index 6384d57..3d08371 100644
--- a/libc/include/string.h
+++ b/libc/include/string.h
@@ -96,11 +96,7 @@
__BIONIC_FORTIFY_INLINE
void* memcpy(void* __restrict dest, const void* __restrict src, size_t copy_amount) {
- char *d = (char *) dest;
- const char *s = (const char *) src;
- size_t d_len = __bos0(d);
-
- return __builtin___memcpy_chk(dest, src, copy_amount, d_len);
+ return __builtin___memcpy_chk(dest, src, copy_amount, __bos0(dest));
}
__BIONIC_FORTIFY_INLINE