diff --git a/code/RemoveComments.cpp b/code/RemoveComments.cpp
index 37d74124d..1ed94ea4d 100644
--- a/code/RemoveComments.cpp
+++ b/code/RemoveComments.cpp
@@ -66,6 +66,10 @@ void CommentRemover::RemoveLineComments(const char* szComment,
         if (!strncmp(szBuffer,szComment,len)) {
             while (!IsLineEnd(*szBuffer))
                 *szBuffer++ = chReplacement;
+
+            if (!*szBuffer) {
+                break;
+            }
         }
         ++szBuffer;
     }