Ignore extraneous bytes after SOS.

filipl · filipl · commit e6989cc5af0f · 2019-08-25T11:41:53.000+02:00
diff --git a/src/decoder.rs b/src/decoder.rs
@@ -519,7 +519,10 @@ impl<R: Read> Decoder<R> {
             }
         }
 
-        let marker = huffman.take_marker(&mut self.reader)?;
+        let mut marker = huffman.take_marker(&mut self.reader)?;
+        while let Some(Marker::RST(_)) = marker {
+            marker = self.read_marker().ok();
+        }
 
         if produce_data {
             // Retrieve all the data from the worker thread.

Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,10 @@ impl<R: Read> Decoder<R> {`
`519`	`519`	`}`
`520`	`520`	`}`
`521`	`521`
`522`		`- let marker = huffman.take_marker(&mut self.reader)?;`
	`522`	`+ let mut marker = huffman.take_marker(&mut self.reader)?;`
	`523`	`+ while let Some(Marker::RST(_)) = marker {`
	`524`	`+ marker = self.read_marker().ok();`
	`525`	`+ }`
`523`	`526`
`524`	`527`	`if produce_data {`
`525`	`528`	`// Retrieve all the data from the worker thread.`