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

Revert "Fix invalid conversion in C++ code"

Browse Source 
This reverts commit 4b4dfea25d660a8a27e95ea531686001246b3d1e.
This commit is contained in:
sin 2015-03-11 09:21:00 +00:00
parent 4b4dfea25d
commit 499ea65dd5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/string.h
View File

@ -10,11 +10,13 @@ void *
__fortify_memcpy(void *dest, const void *src, size_t n) __fortify_memcpy(void *dest, const void *src, size_t n)
{ {
size_t bos = __builtin_object_size(dest, 0); size_t bos = __builtin_object_size(dest, 0);
char *d = dest;
const char *s = src;
/* trap if pointers are overlapping but not if dest == src. /* trap if pointers are overlapping but not if dest == src.
* gcc seems to like to generate code that relies on dest == src */ * gcc seems to like to generate code that relies on dest == src */
if ((dest < src && dest + n > src) || if ((d < s && d + n > s) ||
(src < dest && src + n > dest)) (s < d && s + n > d))
__builtin_trap(); __builtin_trap();
if (n > bos) if (n > bos)
__builtin_trap(); __builtin_trap();