From: Alexander Monakov <amonakov@ispras.ru>
Date: Mon, 9 Mar 2020 18:32:16 +0000 (+0300)
Subject: remove redundant condition in memccpy
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=526df238d0d05fe4e8446720d9d0374646f82f82;p=oweals%2Fmusl.git

remove redundant condition in memccpy

Commit d9bdfd164 ("fix memccpy to not access buffer past given size")
correctly added a check for 'n' nonzero, but made the pre-existing test
'*s==c' redundant: n!=0 implies *s==c. Remove the unnecessary check.

Reported by Alexey Izbyshev.
---

diff --git a/src/string/memccpy.c b/src/string/memccpy.c
index 00c18e2b..3b0a3700 100644
--- a/src/string/memccpy.c
+++ b/src/string/memccpy.c
@@ -29,6 +29,6 @@ void *memccpy(void *restrict dest, const void *restrict src, int c, size_t n)
 #endif
 	for (; n && (*d=*s)!=c; n--, s++, d++);
 tail:
-	if (n && *s==c) return d+1;
+	if (n) return d+1;
 	return 0;
 }