atmos
/
fortify-headers
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add wcsncat() and wcsncpy() checks

This commit is contained in:
sin 2015-03-04 12:42:55 +00:00
parent a28cd72ce6
commit ce3377dbb2
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/wchar.h
View File

@ -85,6 +85,35 @@ __fortify_wcscpy(wchar_t *d, const wchar_t *s)
return wcscpy(d, s);
}
static inline __attribute__ ((always_inline))
wchar_t *
__fortify_wcsncat(wchar_t *d, const wchar_t *s, size_t n)
{
size_t bos = __builtin_object_size(d, 0);
size_t slen, dlen;
if (n > bos / sizeof(wchar_t)) {
slen = wcslen(s);
dlen = wcslen(d);
if (slen > n)
slen = n;
if (slen + dlen + 1 > bos / sizeof(wchar_t))
__builtin_trap();
}
return wcsncat(d, s, n);
}
static inline __attribute__ ((always_inline))
wchar_t *
__fortify_wcsncpy(wchar_t *d, const wchar_t *s, size_t n)
{
size_t bos = __builtin_object_size(d, 0);
if (n > bos / sizeof(wchar_t))
__builtin_trap();
return wcsncpy(d, s, n);
}
static inline __attribute__ ((always_inline))
wchar_t *
__fortify_wmemcpy(wchar_t *d, const wchar_t *s, size_t n)
@ -132,6 +161,10 @@ __fortify_wmemset(wchar_t *s, wchar_t c, size_t n)
#define wcscat(d, s) __fortify_wcscat(d, s)
#undef wcscpy
#define wcscpy(d, s) __fortify_wcscpy(d, s)
#undef wcsncat
#define wcsncat(d, s, n) __fortify_wcsncat(d, s, n)
#undef wcsncpy
#define wcsncpy(d, s, n) __fortify_wcsncpy(d, s, n)
#undef wmemcpy
#define wmemcpy(d, s, n) __fortify_wmemcpy(d, s, n)
#undef wmemmove