2 files changed, 2 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ee955245452..a83f79ef2de 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
         * lread.c (lisp_file_lexically_bound_p): Use ints rather than endptrs.
         (lisp_file_lexically_bound_p, read1): Use unsigned instead of int.
+        (safe_to_load_p): Make the end-of-loop test the inverse of the in-loop.
 
         * print.c (print_error_message): Avoid int overflow.
 
diff --git a/src/lread.c b/src/lread.c
index fb5b6cd0136..8777bc34545 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -907,7 +907,7 @@ safe_to_load_p (int fd)
         if (i == 4)
           version = buf[i];
 
-      if (i == nbytes
+      if (i >= nbytes
           || fast_c_string_match_ignore_case (Vbytecomp_version_regexp,
                                               buf + i) < 0)
         safe_p = 0;