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

Fix some checks in wchar.h 

Some of these functions allow the destination pointer to be NULL.
Do not trap in that case as nothing will be written to the destination
buffer.
This commit is contained in:
sin 2015-03-06 12:39:11 +00:00
parent 9b128ed538
commit ead32d6320
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/wchar.h
View File

@ -59,7 +59,7 @@ __fortify_mbstowcs(wchar_t *ws, const char *s, size_t wn)
{
size_t bos = __builtin_object_size(ws, 0);
if (wn > bos / sizeof(wchar_t))
if (ws && wn > bos / sizeof(wchar_t))
__builtin_trap();
return mbstowcs(ws, s, wn);
}
@ -70,7 +70,7 @@ __fortify_wcrtomb(char *s, wchar_t wc, mbstate_t *st)
{
size_t bos = __builtin_object_size(s, 0);
if (MB_CUR_MAX > bos)
if (s && MB_CUR_MAX > bos)
__builtin_trap();
return wcrtomb(s, wc, st);
}
@ -167,7 +167,7 @@ __fortify_wcstombs(char *s, const wchar_t *ws, size_t n)
{
size_t bos = __builtin_object_size(s, 0);
if (n > bos)
if (s && n > bos)
__builtin_trap();
return wcstombs(s, ws, n);
}
@ -178,7 +178,7 @@ __fortify_wctomb(char *s, wchar_t wc)
{
size_t bos = __builtin_object_size(s, 0);
if (MB_CUR_MAX > bos)
if (s && MB_CUR_MAX > bos)
__builtin_trap();
return wctomb(s, wc);
}