Bugfix: String::replace not using memmove (#2384)

Can fail when regions overlap
SmingHub · Oct 11, 2021 · 14366be · 14366be
1 parent 333af2e
commit 14366be
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Sming/Wiring/WString.cpp b/Sming/Wiring/WString.cpp
@@ -860,14 +860,14 @@ bool String::replace(const char* find_buf, size_t find_len, const char* replace_
 		char* writeTo = buf;
 		while((foundAt = (char*)memmem(readFrom, end - readFrom, find_buf, find_len)) != nullptr) {
 			size_t n = foundAt - readFrom;
-			memcpy(writeTo, readFrom, n);
+			memmove(writeTo, readFrom, n);
 			writeTo += n;
 			memcpy(writeTo, replace_buf, replace_len);
 			writeTo += replace_len;
 			readFrom = foundAt + find_len;
 			len += diff;
 		}
-		memcpy(writeTo, readFrom, end - readFrom);
+		memmove(writeTo, readFrom, end - readFrom);
 		setlen(len);
 	} else {
 		size_t size = len; // compute size needed for result