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

Handle early termination in wcsnrtombs() and mbsnrtowcs()

This commit is contained in:
sin 2015-03-04 17:10:16 +00:00
parent 3d237352de
commit 7392bcaef8
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/wchar.h
View File

@ -23,8 +23,14 @@ __fortify_mbsnrtowcs(wchar_t *d, const char **s, size_t n,
size_t wn, mbstate_t *st)
{
size_t bos = __builtin_object_size(d, 0);
size_t actual;
if (wn > bos / sizeof(wchar_t))
if (wn > (size_t)-1 / sizeof(wchar_t))
__builtin_trap();
actual = wn * sizeof(wchar_t);
if (actual > n)
actual = n;
if (actual > bos)
__builtin_trap();
return mbsnrtowcs(d, s, n, wn, st);
}
@ -120,8 +126,14 @@ __fortify_wcsnrtombs(char *d, const wchar_t **s, size_t wn,
size_t n, mbstate_t *st)
{
size_t bos = __builtin_object_size(d, 0);
size_t actual;
if (n > bos)
if (wn > (size_t)-1 / sizeof(wchar_t))
__builtin_trap();
actual = wn * sizeof(wchar_t);
if (actual > n)
actual = n;
if (actual > bos)
__builtin_trap();
return wcsnrtombs(d, s, wn, n, st);
}