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

Fix wcrtomb() check 

This was breaking valid code, example:
char c;
wcrtomb(&c, L'0', st);
This commit is contained in:
sin 2015-07-15 15:53:41 +01:00
parent 7fd984fcb5
commit a255506ca4
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/wchar.h
View File

@ -16,9 +16,13 @@
#ifndef _FORTIFY_WCHAR_H
#define _FORTIFY_WCHAR_H
__extension__
#include_next <limits.h>
__extension__
#include_next <stdlib.h>
__extension__
#include_next <string.h>
__extension__
#include_next <wchar.h>
#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
@ -99,10 +103,17 @@ _FORTIFY_FN(mbstowcs) size_t mbstowcs(wchar_t *__ws, const char *__s, size_t __w
_FORTIFY_FN(wcrtomb) size_t wcrtomb(char *__s, wchar_t __w, mbstate_t *__st)
{
char __buf[MB_LEN_MAX];
size_t __b = __builtin_object_size(__s, 0);
size_t __r;
if (__s && MB_CUR_MAX > __b)
__builtin_trap();
if (__s) {
__r = __orig_wcrtomb(__buf, __w, __st);
if (__r > __b)
__builtin_trap();
memcpy(__s, __buf, __r);
return __r;
}
return __orig_wcrtomb(__s, __w, __st);
}