Improve diagnostics from the assembler __strcat_chk routines.

Change-Id: I44cbe5389c66de6618e581a6e302eea22c39d6fb

1 files changed, 6 insertions, 0 deletions

diff --git a/libc/bionic/fortify.cpp b/libc/bionic/fortify.cpp
index ad7aa04f3..278c606e1 100644
--- a/libc/bionic/fortify.cpp
+++ b/libc/bionic/fortify.cpp
@@ -268,6 +268,12 @@ char* __stpncpy_chk2(char* __restrict dst, const char* __restrict src,
   return dst;
 }
 
+// strcat is performance-critical enough that we have assembler __strcat_chk implementations.
+// This function is used to give better diagnostics than we can easily do from assembler.
+extern "C" void __strcat_chk_fail(size_t dst_buf_size) {
+  __fortify_fatal("strcat: prevented write past end of %zu-byte buffer", dst_buf_size);
+}
+
 char* __strchr_chk(const char* p, int ch, size_t s_len) {
   for (;; ++p, s_len--) {
     if (__predict_false(s_len == 0)) {