summaryrefslogtreecommitdiffstats
path: root/libc/arch-mips
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-02-14 13:21:22 -0800
committerElliott Hughes <enh@google.com>2015-02-14 13:21:22 -0800
commit41ef902379ba24bd8a3ca6d7733b8376efb55ebd (patch)
tree855ac7e3fa276bfb55594e4efb28c7c29cf28f3f /libc/arch-mips
parentf9fb52ab309c97d5b2ef4f8e1daff3eed4cf4024 (diff)
downloadbionic-41ef902379ba24bd8a3ca6d7733b8376efb55ebd.zip
bionic-41ef902379ba24bd8a3ca6d7733b8376efb55ebd.tar.gz
bionic-41ef902379ba24bd8a3ca6d7733b8376efb55ebd.tar.bz2
Fix memchr overflow.
The overflow's actually in the generic C implementation of memchr. While I'm here, let's switch our generic memrchr to the OpenBSD version too. Bug: https://code.google.com/p/android/issues/detail?id=147048 Change-Id: I296ae06a1ee196d2c77c95a22f11ee4d658962da
Diffstat (limited to 'libc/arch-mips')
-rw-r--r--libc/arch-mips/mips.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/arch-mips/mips.mk b/libc/arch-mips/mips.mk
index 7e3fe25..33eceab 100644
--- a/libc/arch-mips/mips.mk
+++ b/libc/arch-mips/mips.mk
@@ -10,8 +10,6 @@ libc_bionic_src_files_mips += \
bionic/__memset_chk.cpp \
bionic/__strcpy_chk.cpp \
bionic/__strcat_chk.cpp \
- bionic/memchr.c \
- bionic/memrchr.c \
bionic/strchr.cpp \
bionic/strnlen.c \
bionic/strrchr.cpp \
@@ -27,7 +25,9 @@ libc_freebsd_src_files_mips += \
upstream-freebsd/lib/libc/string/wmemmove.c \
libc_openbsd_src_files_mips += \
+ upstream-openbsd/lib/libc/string/memchr.c \
upstream-openbsd/lib/libc/string/memmove.c \
+ upstream-openbsd/lib/libc/string/memrchr.c \
upstream-openbsd/lib/libc/string/stpcpy.c \
upstream-openbsd/lib/libc/string/stpncpy.c \
upstream-openbsd/lib/libc/string/strcat.c \