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

diff --git a/libc/bionic/__strlen_chk.cpp b/libc/bionic/__strlen_chk.cpp
index 67410d4..5cc052e 100644
--- a/libc/bionic/__strlen_chk.cpp
+++ b/libc/bionic/__strlen_chk.cpp
@@ -57,9 +57,7 @@
     size_t ret = strlen(s);
 
     if (__builtin_expect(ret >= s_len, 0)) {
-        __libc_android_log_print(ANDROID_LOG_FATAL, "libc",
-            "*** strlen read overflow detected ***\n");
-        abort();
+        __fortify_chk_fail("strlen read overflow", 0);
     }
 
     return ret;