X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibc.so_src%2Fstring.c;h=6ee6d6cadf58022c8f3283b0d198152cd064f89a;hb=d9d6e131a50f422316f22892aa314405e203261b;hp=2ab271f5ff298082cce0c3ece062bb3bdfe1d398;hpb=5baf31fcd4ec90827f62f7fbded545fda85ecdbb;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libc.so_src/string.c b/Usermode/Libraries/libc.so_src/string.c
index 2ab271f5..6ee6d6ca 100644
--- a/Usermode/Libraries/libc.so_src/string.c
+++ b/Usermode/Libraries/libc.so_src/string.c
@@ -282,14 +282,23 @@ EXPORT void *memcpy(void *__dest, const void *__src, size_t count)
  */
 EXPORT void *memmove(void *dest, const void *src, size_t count)
 {
-	char *sp = (char *)src;
+	const char *sp = (const char *)src;
 	char *dp = (char *)dest;
 	// Check if the areas overlap
-	if( (uintptr_t)src < (uintptr_t)dest && (uintptr_t)dest < (uintptr_t)src+count )
-		for(;count--;)
-			dp[count] = sp[count];
-	else
+	if( sp >= dp+count )
+		memcpy(dest, src, count);
+	else if( dp >= sp+count )
 		memcpy(dest, src, count);
+	else {
+		if( sp < dp ) {
+			while(count--)
+				dp[count] = sp[count];
+		}
+		else {
+			while(count--)
+				*dp++ = *sp++;
+		}
+	}
 	return dest;
 }