software/libbase: fix memcpy handling of buffers with differing align…

…ments
m-labs · May 27, 2012 · 48b70f0 · 48b70f0
1 parent 4dbc938
commit 48b70f0
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/software/libbase/libc.c b/software/libbase/libc.c
@@ -265,6 +265,13 @@ void *memcpy(void *to, const void *from, size_t n)
 		from = cfrom;
 		n--;
 	}
+	if((long)from & 1) {
+		char *cto = to;
+		const char *cfrom = from;
+		for (; n; n--)
+			*cto++ = *cfrom++;
+		return xto;
+	}
 	if(n > 2 && (long)to & 2) {
 		short *sto = to;
 		const short *sfrom = from;
@@ -278,7 +285,7 @@ void *memcpy(void *to, const void *from, size_t n)
 		long *lto = to;
 		const long *lfrom = from;
 		for(; temp; temp--)
-		*lto++ = *lfrom++;
+			*lto++ = *lfrom++;
 		to = lto;
 		from = lfrom;
 	}