Merge pull request #590 from benesch/copy-out-short-reads

Don't accidentally return early from CopyOutReader
sfackler · Apr 1, 2020 · e3d3c6d · e3d3c6d
2 parents 70ca1b4 + dd0c39e
commit e3d3c6d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/postgres/src/copy_out_reader.rs b/postgres/src/copy_out_reader.rs
@@ -34,15 +34,15 @@ impl Read for CopyOutReader<'_> {
 
 impl BufRead for CopyOutReader<'_> {
     fn fill_buf(&mut self) -> io::Result<&[u8]> {
-        if !self.cur.has_remaining() {
+        while !self.cur.has_remaining() {
             let mut stream = self.stream.pinned();
             match self
                 .connection
                 .block_on({ async { stream.next().await.transpose() } })
             {
                 Ok(Some(cur)) => self.cur = cur,
                 Err(e) => return Err(io::Error::new(io::ErrorKind::Other, e)),
-                Ok(None) => {}
+                Ok(None) => break,
             };
         }