generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix memchr with a zero length."

Browse Source
This commit is contained in:
Christopher Ferris 2014-07-30 23:25:50 +00:00 committed by Gerrit Code Review
commit 0f7ed163cf
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libc/arch-arm64/generic/bionic/memchr.S
View File

@ -75,6 +75,7 @@ ENTRY(memchr)
* Magic constant 0x40100401 allows us to identify which lane matches
* the requested byte.
*/
cbz cntin, .Lzero_length
mov wtmp2, #0x0401
movk wtmp2, #0x4010, lsl #16
dup vrepchr.16b, chrin
@ -157,4 +158,8 @@ ENTRY(memchr)
/* Select result or NULL */
csel result, xzr, result, eq
ret
.Lzero_length:
mov result, xzr
ret
END(memchr)

8
tests/string_test.cpp
View File

@ -763,6 +763,14 @@ TEST(string, memchr) {
}
}
TEST(string, memchr_zero) {
uint8_t* buffer;
ASSERT_EQ(0, posix_memalign(reinterpret_cast<void**>(&buffer), 64, 64));
memset(buffer, 10, 64);
ASSERT_TRUE(NULL == memchr(buffer, 5, 0));
ASSERT_TRUE(NULL == memchr(buffer, 10, 0));
}
TEST(string, memrchr) {
int seek_char = random() & 255;
StringTestState<char> state(SMALL);