diff --git a/stepmania/src/MsdFile.cpp b/stepmania/src/MsdFile.cpp
index 5bf3c531b1..9a8962ede9 100644
--- a/stepmania/src/MsdFile.cpp
+++ b/stepmania/src/MsdFile.cpp
@@ -69,7 +69,7 @@ void MsdFile::ReadBuf( char *buf, int len )
 			do {
 				buf[i] = ' ';
 				i++;
-			} while(buf[i] != '\n');
+			} while(i < len && buf[i] != '\n');
 
 			continue;
 		}