diff options
| -rw-r--r-- | include/string.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/string.h b/include/string.h index 6771b1d..86c258d 100644 --- a/include/string.h +++ b/include/string.h | |||
| @@ -10,13 +10,11 @@ void * | |||
| 10 | __fortify_memcpy(void *dest, const void *src, size_t n) | 10 | __fortify_memcpy(void *dest, const void *src, size_t n) |
| 11 | { | 11 | { |
| 12 | size_t bos = __builtin_object_size(dest, 0); | 12 | size_t bos = __builtin_object_size(dest, 0); |
| 13 | char *d = dest; | ||
| 14 | const char *s = src; | ||
| 15 | 13 | ||
| 16 | /* trap if pointers are overlapping but not if dest == src. | 14 | /* trap if pointers are overlapping but not if dest == src. |
| 17 | * gcc seems to like to generate code that relies on dest == src */ | 15 | * gcc seems to like to generate code that relies on dest == src */ |
| 18 | if ((d < s && d + n > s) || | 16 | if ((dest < src && dest + n > src) || |
| 19 | (s < d && s + n > d)) | 17 | (src < dest && src + n > dest)) |
| 20 | __builtin_trap(); | 18 | __builtin_trap(); |
| 21 | if (n > bos) | 19 | if (n > bos) |
| 22 | __builtin_trap(); | 20 | __builtin_trap(); |
