Merge pull request #193 from image-rs/issue-192-desync-packbits

Fix read in packbits decoder
image-rs · Dec 3, 2022 · aa42fcb · aa42fcb
2 parents 6c65e66 + 1f7b25e
commit aa42fcb
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/decoder/stream.rs b/src/decoder/stream.rs
@@ -332,23 +332,23 @@ impl<R: Read> Read for PackBitsReader<R> {
         }
 
         let length = buf.len().min(self.count);
-        match self.state {
-            PackBitsReaderState::Literal => {
-                self.reader.read(&mut buf[..length])?;
-            }
+        let actual = match self.state {
+            PackBitsReaderState::Literal => self.reader.read(&mut buf[..length])?,
             PackBitsReaderState::Repeat { value } => {
                 for b in &mut buf[..length] {
                     *b = value;
                 }
+
+                length
             }
             PackBitsReaderState::Header => unreachable!(),
-        }
+        };
 
-        self.count -= length;
+        self.count -= actual;
         if self.count == 0 {
             self.state = PackBitsReaderState::Header;
         }
-        return Ok(length);
+        return Ok(actual);
     }
 }