further cleanup memcpy fortify implementation

Bug: 17784968

(cherry picked from commit b84f667e93)

Change-Id: I68fc2cc0a1ee7f0887edf3681eb83ef678de1383
This commit is contained in:
Nick Kralevich 2014-10-05 06:52:24 -07:00 committed by Elliott Hughes
parent 7ad2147a08
commit db408bf421

View file

@ -96,11 +96,7 @@ extern size_t strxfrm_l(char* __restrict, const char* __restrict, size_t, locale
__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