diff options
author | Elliott Hughes <enh@google.com> | 2013-10-15 16:43:38 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2013-10-15 16:49:28 -0700 |
commit | d1eda33f012e46083b91e087fb79d14a5ce70f0e (patch) | |
tree | 2d075e9d43c3a300327e79ee27c5b8330d8dce4c /libc/bionic/__fgets_chk.cpp | |
parent | dc9d8d050a43e1cd32f1337e79187124bb15d938 (diff) | |
download | android_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/__fgets_chk.cpp')
-rw-r--r-- | libc/bionic/__fgets_chk.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/libc/bionic/__fgets_chk.cpp b/libc/bionic/__fgets_chk.cpp index fc903e474..61dad7077 100644 --- a/libc/bionic/__fgets_chk.cpp +++ b/libc/bionic/__fgets_chk.cpp @@ -41,16 +41,15 @@ * This fgets check is called if _FORTIFY_SOURCE is defined and * greater than 0. */ -extern "C" char *__fgets_chk(char *dest, int supplied_size, - FILE *stream, size_t dest_len_from_compiler) -{ - if (supplied_size < 0) { - __fortify_chk_fail("fgets buffer size less than 0", 0); - } +extern "C" char* __fgets_chk(char* dest, int supplied_size, + FILE* stream, size_t dest_len_from_compiler) { + if (supplied_size < 0) { + __fortify_chk_fail("fgets: buffer size < 0", 0); + } - if (((size_t) supplied_size) > dest_len_from_compiler) { - __fortify_chk_fail("fgets prevented write past end of buffer", 0); - } + if (((size_t) supplied_size) > dest_len_from_compiler) { + __fortify_chk_fail("fgets: prevented write past end of buffer", 0); + } - return fgets(dest, supplied_size, stream); + return fgets(dest, supplied_size, stream); } |