Fix calls to read-bytevector! that weren't aware of EOF values.

diff --git a/src/edwin/sendmail.scm b/src/edwin/sendmail.scm
index 560acafb44abfeb44c03db306f165586c44dc63f..c658af9a924df4140776de13d6984b659bcd98b6 100644 (file)
--- a/src/edwin/sendmail.scm
+++ b/src/edwin/sendmail.scm
@@ -1464,7 +1464,7 @@ the user from the mailer."
                  (let ((buffer (make-bytevector 4096)))
                    (let loop ()
                      (let ((n-read (read-bytevector! buffer input-port)))
-                       (if (> n-read 0)
+                       (if (exact-positive-integer? n-read)
                            (begin
                              (encode-base64:update context buffer 0 n-read)
                              (loop))))))))

diff --git a/src/imail/imail-util.scm b/src/imail/imail-util.scm
index d6cef5f4223fd2a8f4739157dfde383f1ad07e71..4324071202a6ce2c69ad31fd2af482a555e8a009 100644 (file)
--- a/src/imail/imail-util.scm
+++ b/src/imail/imail-util.scm
@@ -431,7 +431,7 @@ USA.
             (nread (read-bytevector! buffer port)))
        ;; Check to make sure that the length didn't change under us
        ;; while we were reading.  If it did, this is no good.
-       (and (= nread length)
+       (and (eqv? nread length)
             (object-new-type type-code:legacy-string buffer))))))
 
 (define (string-port/position port)

diff --git a/src/runtime/http-io.scm b/src/runtime/http-io.scm
index 3b79c7c5a55d218b4028e1f26df96e4ff5e5b0a4..c9ca27a8de3362676c194693bb832f5c3226f1e3 100644 (file)
--- a/src/runtime/http-io.scm
+++ b/src/runtime/http-io.scm
@@ -300,7 +300,7 @@ USA.
     (let loop ((n n))
       (if (> n 0)
          (let ((m (read-bytevector! buffer port 0 (min n len))))
-           (if (= m 0)
+           (if (not (exact-positive-integer? m))
                (error "Premature EOF in HTTP message body."))
            (do ((i 0 (+ i 1)))
                ((not (< i m)))
@@ -329,7 +329,7 @@ USA.
      (let ((buffer (make-bytevector #x1000)))
        (let loop ()
         (let ((n (read-bytevector! buffer port)))
-          (if (> n 0)
+          (if (exact-positive-integer? n)
               (begin
                 (do ((i 0 (+ i 1)))
                     ((not (< i n)))