1 files changed, 3 insertions, 3 deletions
diff --git a/win32/win32.c b/win32/win32.c
index 530cada51f..f4a3ee6375 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1712,9 +1712,9 @@ rb_w32_strerror(int e)
 	buffer[sizeof(buffer) - 1] = 0;
     }
 
-    for (p = buffer + strlen(buffer) - 1; buffer <= p; p--) {
-	if (*p != '\r' && *p != '\n') break;
-	*p = 0;
+    p = buffer;
+    while ((p = strpbrk(p, "\r\n")) != NULL) {
+	memmove(p, p + 1, strlen(p));
     }
     return buffer;
 }