aboutsummaryrefslogtreecommitdiffstats
path: root/libc/bionic/__strlen_chk.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-10-15 16:43:38 -0700
committerElliott Hughes <enh@google.com>2013-10-15 16:49:28 -0700
commitd1eda33f012e46083b91e087fb79d14a5ce70f0e (patch)
tree2d075e9d43c3a300327e79ee27c5b8330d8dce4c /libc/bionic/__strlen_chk.cpp
parentdc9d8d050a43e1cd32f1337e79187124bb15d938 (diff)
downloadandroid_bionic-d1eda33f012e46083b91e087fb79d14a5ce70f0e.tar.gz
android_bionic-d1eda33f012e46083b91e087fb79d14a5ce70f0e.tar.bz2
android_bionic-d1eda33f012e46083b91e087fb79d14a5ce70f0e.zip
Avoid confusing "read prevented write" log messages.
Moving to a "function: message" style avoids ambiguity. Change-Id: If9d590e50265c61725d3673bd03796e65edd2d5e
Diffstat (limited to 'libc/bionic/__strlen_chk.cpp')
-rw-r--r--libc/bionic/__strlen_chk.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/libc/bionic/__strlen_chk.cpp b/libc/bionic/__strlen_chk.cpp
index d4c5e43af..6621a6abe 100644
--- a/libc/bionic/__strlen_chk.cpp
+++ b/libc/bionic/__strlen_chk.cpp
@@ -53,12 +53,12 @@
*
* or anytime strlen reads beyond an object boundary.
*/
-extern "C" size_t __strlen_chk(const char *s, size_t s_len) {
- size_t ret = strlen(s);
+extern "C" size_t __strlen_chk(const char* s, size_t s_len) {
+ size_t ret = strlen(s);
- if (__predict_false(ret >= s_len)) {
- __fortify_chk_fail("strlen prevented read past end of buffer", 0);
- }
+ if (__predict_false(ret >= s_len)) {
+ __fortify_chk_fail("strlen: prevented read past end of buffer", 0);
+ }
- return ret;
+ return ret;
}