diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-01 17:20:25 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-02 19:50:28 +0000 |
| commit | c4050b03011a732c494443a87c2d14c23e5c08ea (patch) | |
| tree | f5addc099699605ae861ecba92a211c30ce0b9a1 /libc/bionic/__memcpy_chk.cpp | |
| parent | 3fcf18a70f7efd0ee1b91f11327114553a9f2565 (diff) | |
| parent | 8e39d2f9f403639195e430f81a47ad3940bd6975 (diff) | |
| download | bionic-c4050b03011a732c494443a87c2d14c23e5c08ea.zip bionic-c4050b03011a732c494443a87c2d14c23e5c08ea.tar.gz bionic-c4050b03011a732c494443a87c2d14c23e5c08ea.tar.bz2 | |
Merge tag 'android-4.4_r1' into cm-11.0
Android 4.4 Release 1.0
Conflicts:
libc/arch-arm/arm.mk
libc/upstream-freebsd/lib/libc/stdlib/getopt_long.c
linker/linker_phdr.cpp
Diffstat (limited to 'libc/bionic/__memcpy_chk.cpp')
| -rw-r--r-- | libc/bionic/__memcpy_chk.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/bionic/__memcpy_chk.cpp b/libc/bionic/__memcpy_chk.cpp index b36cfdd..a3d744c 100644 --- a/libc/bionic/__memcpy_chk.cpp +++ b/libc/bionic/__memcpy_chk.cpp @@ -45,7 +45,7 @@ extern "C" void *__memcpy_chk(void *dest, const void *src, size_t copy_amount, size_t dest_len) { - if (__builtin_expect(copy_amount > dest_len, 0)) { + if (__predict_false(copy_amount > dest_len)) { __fortify_chk_fail("memcpy buffer overflow", BIONIC_EVENT_MEMCPY_BUFFER_OVERFLOW); } |