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/__strcpy_chk.cpp

diff --git a/libc/bionic/__strcpy_chk.cpp b/libc/bionic/__strcpy_chk.cpp
index 1d45ea2..74ceda1 100644
--- a/libc/bionic/__strcpy_chk.cpp
+++ b/libc/bionic/__strcpy_chk.cpp
@@ -45,10 +45,8 @@
     // TODO: optimize so we don't scan src twice.
     size_t src_len = strlen(src) + 1;
     if (src_len > dest_len) {
-        __libc_android_log_print(ANDROID_LOG_FATAL, "libc",
-            "*** strcpy buffer overflow detected ***\n");
-        __libc_android_log_event_uid(BIONIC_EVENT_STRCPY_BUFFER_OVERFLOW);
-        abort();
+        __fortify_chk_fail("strcpy buffer overflow",
+                             BIONIC_EVENT_STRCPY_BUFFER_OVERFLOW);
     }
 
     return strcpy(dest, src);