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

53
libc/bionic/__strncat_chk.cpp
View File

@@ -41,33 +41,30 @@
* This strncat check is called if _FORTIFY_SOURCE is defined and
* greater than 0.
*/
extern "C" char *__strncat_chk(
char* __restrict dest,
const char* __restrict src,
size_t len, size_t dest_buf_size)
{
if (len == 0) {
return dest;
}
size_t dest_len = __strlen_chk(dest, dest_buf_size);
char *d = dest + dest_len;
dest_buf_size -= dest_len;
while (*src != '\0') {
*d++ = *src++;
len--; dest_buf_size--;
if (__predict_false(dest_buf_size == 0)) {
__fortify_chk_fail("strncat prevented write past end of buffer",
BIONIC_EVENT_STRNCAT_BUFFER_OVERFLOW);
}
if (len == 0) {
break;
}
}
*d = '\0';
extern "C" char* __strncat_chk(char* __restrict dest, const char* __restrict src,
size_t len, size_t dest_buf_size) {
if (len == 0) {
return dest;
}
size_t dest_len = __strlen_chk(dest, dest_buf_size);
char *d = dest + dest_len;
dest_buf_size -= dest_len;
while (*src != '\0') {
*d++ = *src++;
len--; dest_buf_size--;
if (__predict_false(dest_buf_size == 0)) {
__fortify_chk_fail("strncat: prevented write past end of buffer",
BIONIC_EVENT_STRNCAT_BUFFER_OVERFLOW);
}
if (len == 0) {
break;
}
}
*d = '\0';
return dest;
}