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

Fix mbsnrtowcs() and wcsnrtombs() checks

Browse Source
This commit is contained in:
sin 2015-03-05 18:21:52 +00:00
parent c51977cfcc
commit 9b128ed538
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
include/wchar.h
View File

@ -23,16 +23,19 @@ __fortify_mbsnrtowcs(wchar_t *d, const char **s, size_t n,
size_t wn, mbstate_t *st) size_t wn, mbstate_t *st)
{ {
size_t bos = __builtin_object_size(d, 0); size_t bos = __builtin_object_size(d, 0);
size_t actual; size_t r;
if (wn > (size_t)-1 / sizeof(wchar_t)) if (wn > n / sizeof(wchar_t)) {
__builtin_trap(); bos /= sizeof(wchar_t);
actual = wn * sizeof(wchar_t); r = mbsnrtowcs(d, s, n, wn > bos ? bos : wn, st);
if (actual > n) if (bos < wn && d && *s && r != (size_t)-1)
actual = n; __builtin_trap();
if (actual > bos) } else {
__builtin_trap(); r = mbsnrtowcs(d, s, n > bos ? bos : n, wn, st);
return mbsnrtowcs(d, s, n, wn, st); if (bos < n && d && *s && r != (size_t)-1)
__builtin_trap();
}
return r;
} }
static inline __attribute__ ((always_inline)) static inline __attribute__ ((always_inline))
@ -129,16 +132,19 @@ __fortify_wcsnrtombs(char *d, const wchar_t **s, size_t wn,
size_t n, mbstate_t *st) size_t n, mbstate_t *st)
{ {
size_t bos = __builtin_object_size(d, 0); size_t bos = __builtin_object_size(d, 0);
size_t actual; size_t r;
if (wn > (size_t)-1 / sizeof(wchar_t)) if (wn > n / sizeof(wchar_t)) {
__builtin_trap(); bos /= sizeof(wchar_t);
actual = wn * sizeof(wchar_t); r = wcsnrtombs(d, s, wn > bos ? bos : wn, n, st);
if (actual > n) if (bos < wn && d && *s && r != (size_t)-1)
actual = n; __builtin_trap();
if (actual > bos) } else {
__builtin_trap(); r = wcsnrtombs(d, s, wn, n > bos ? bos : n, st);
return wcsnrtombs(d, s, wn, n, st); if (bos < n && d && *s && r != (size_t)-1)
__builtin_trap();
}
return r;
} }
static inline __attribute__ ((always_inline)) static inline __attribute__ ((always_inline))