fortify-headers

standalone fortify-source implementation
git clone git://git.2f30.org/fortify-headers.git
Log | Files | Refs | README | LICENSE

commit ce3377dbb20b5ff41349b195d2a3c21317012c98
parent a28cd72ce6fa6f5619f0952a9569f046a13770d2
Author: sin <sin@2f30.org>
Date:   Wed Mar  4 12:42:55 +0000

Add wcsncat() and wcsncpy() checks

Diffstat:
include/wchar.h | 33+++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+), 0 deletions(-)
diff --git a/include/wchar.h b/include/wchar.h @@ -87,6 +87,35 @@ __fortify_wcscpy(wchar_t *d, const wchar_t *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) { size_t bos = __builtin_object_size(d, 0); @@ -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