From 41ef902379ba24bd8a3ca6d7733b8376efb55ebd Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Sat, 14 Feb 2015 13:21:22 -0800 Subject: 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 --- libc/arch-mips64/mips64.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libc/arch-mips64') diff --git a/libc/arch-mips64/mips64.mk b/libc/arch-mips64/mips64.mk index 1376395..2b81e63 100644 --- a/libc/arch-mips64/mips64.mk +++ b/libc/arch-mips64/mips64.mk @@ -9,8 +9,6 @@ libc_bionic_src_files_mips64 += \ 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 \ @@ -30,7 +28,9 @@ libc_freebsd_src_files_mips64 += \ upstream-freebsd/lib/libc/string/wmemmove.c \ libc_openbsd_src_files_mips64 += \ + 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 \ -- cgit v1.1