am 0f7ed163: Merge "Fix memchr with a zero length."

* commit '0f7ed163cf6c1fe6d71a1d7e5fb6d0989213be85': Fix memchr with a zero length.
2014-07-30 23:33:45 +00:00
parent 63b6416f33 0f7ed163cf
commit 30ac3d58ea
2 changed files with 13 additions and 0 deletions
--- a/libc/arch-arm64/generic/bionic/memchr.S
+++ b/libc/arch-arm64/generic/bionic/memchr.S
@@ -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)