Stop iterator on error

Author: kornelski

src/reader/mod.rs

@@ -470,13 +470,15 @@ impl<R: Read> IntoIterator for Decoder<R> {
     fn into_iter(self) -> Self::IntoIter {
         DecoderIter {
             inner: self,
+            ended: false,
         }
     }
 }
 
 /// Use `decoder.into_iter()` to iterate over the frames
 pub struct DecoderIter<R: Read> {
     inner: Decoder<R>,
+    ended: bool,
 }
 
 impl<R: Read> DecoderIter<R> {
@@ -494,10 +496,20 @@ impl<R: Read> Iterator for DecoderIter<R> {
     type Item = Result<Frame<'static>, DecodingError>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        match self.inner.read_next_frame() {
-            Ok(Some(_)) => self.inner.take_current_frame().map(Ok),
-            Ok(None) => None,
-            Err(err) => Some(Err(err)),
+        if !self.ended {
+            match self.inner.read_next_frame() {
+                Ok(Some(_)) => self.inner.take_current_frame().map(Ok),
+                Ok(None) => {
+                    self.ended = true;
+                    None
+                },
+                Err(err) => {
+                    self.ended = true;
+                    Some(Err(err))
+                },
+            }
+        } else {
+            None
         }
     }
 }

tests/stall.rs

@@ -51,7 +51,7 @@ fn test_truncated_file() {
         let truncated = &data[..len];
         // it's expected to fail often, but should not stall or panic
         if let Ok(d) = gif::DecodeOptions::new().read_info(truncated) {
-            let _ = d.into_iter().take_while(|f| f.is_ok()).count();
+            let _ = d.into_iter().count();
         }
     }
 }