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

Fix confstr() check

Browse Source 
Do not crash unless the overflow would actually happen.
This commit is contained in:
sin 2015-07-15 16:05:52 +01:00
parent a255506ca4
commit a51406af12
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/unistd.h
View File

@ -41,10 +41,11 @@ extern "C" {
_FORTIFY_FN(confstr) size_t confstr(int __n, char *__s, size_t __l) _FORTIFY_FN(confstr) size_t confstr(int __n, char *__s, size_t __l)
{ {
size_t __b = __builtin_object_size(__s, 0); size_t __b = __builtin_object_size(__s, 0);
size_t __r = __orig_confstr(__n, __s, __b > __l ? __l : __b);
if (__l > __b) if (__l > __b && __r > __b)
__builtin_trap(); __builtin_trap();
return __orig_confstr(__n, __s, __l); return __r;
} }
_FORTIFY_FN(getcwd) char *getcwd(char *__s, size_t __l) _FORTIFY_FN(getcwd) char *getcwd(char *__s, size_t __l)