commit 326ea5413d18ea019cd1bda415ce428f7bdcafd2
author Nick Kralevich <nnk@google.com> Tue Dec 04 13:55:19 2012 -0800
committer Nick Kralevich <nnk@google.com> Tue Dec 04 15:27:30 2012 -0800
tree 630469ff443d522e356418bfda081452d28606f6
parent db79e827ebcb077ebaa6d6c96915c5bffba9a0ca

clean up FORTIFY_SOURCE handling.

Avoid duplicating huge chunks of code.

Change-Id: Id6145cdfce781c5ffba2abaaa79681d25a7ab28f

libc/bionic/__memcpy_chk.cpp

diff --git a/libc/bionic/__memcpy_chk.cpp b/libc/bionic/__memcpy_chk.cpp
index 991ff02..7a98cb7 100644
--- a/libc/bionic/__memcpy_chk.cpp
+++ b/libc/bionic/__memcpy_chk.cpp
@@ -46,10 +46,8 @@
               size_t copy_amount, size_t dest_len)
 {
     if (__builtin_expect(copy_amount > dest_len, 0)) {
-        __libc_android_log_print(ANDROID_LOG_FATAL, "libc",
-            "*** memcpy buffer overflow detected ***\n");
-        __libc_android_log_event_uid(BIONIC_EVENT_MEMCPY_BUFFER_OVERFLOW);
-        abort();
+        __fortify_chk_fail("memcpy buffer overflow",
+                             BIONIC_EVENT_MEMCPY_BUFFER_OVERFLOW);
     }
 
     return memcpy(dest, src, copy_amount);