generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid confusing "read prevented write" log messages.

Browse Source 
Moving to a "function: message" style avoids ambiguity.

Change-Id: If9d590e50265c61725d3673bd03796e65edd2d5e
This commit is contained in:
Elliott Hughes
2013-10-15 16:43:38 -07:00
parent dc9d8d050a
commit d1eda33f01
22 changed files with 187 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libc/bionic/__strlcat_chk.cpp
View File

@@ -42,12 +42,11 @@
* This strlcat check is called if _FORTIFY_SOURCE is defined and
* greater than 0.
*/
extern "C" size_t __strlcat_chk(char *dest, const char *src,
size_t supplied_size, size_t dest_len_from_compiler)
{
if (__predict_false(supplied_size > dest_len_from_compiler)) {
__fortify_chk_fail("strlcat prevented write past end of buffer", 0);
}
extern "C" size_t __strlcat_chk(char* dest, const char* src,
size_t supplied_size, size_t dest_len_from_compiler) {
if (__predict_false(supplied_size > dest_len_from_compiler)) {
__fortify_chk_fail("strlcat: prevented write past end of buffer", 0);
}
return strlcat(dest, src, supplied_size);
return strlcat(dest, src, supplied_size);
}