Merge pull request #607 from jmlaka/broken_pixel_data

Broken pixel_data fix: support parsing improperly closed encapsulated pixel data
Enet4 · Dec 7, 2024 · c4f57c7 · c4f57c7
2 parents e81a438 + e7f5ae1
commit c4f57c7
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/parser/src/dataset/read.rs b/parser/src/dataset/read.rs
@@ -374,6 +374,18 @@ where
                         }
                     }
                 }
+                Err(DecoderError::DecodeItemHeader {
+                    source: dicom_encoding::decode::Error::ReadItemHeader { source, .. },
+                    ..
+                }) if source.kind() == std::io::ErrorKind::UnexpectedEof
+                   && self.seq_delimiters.pop().map_or(false, |t| t.pixel_data)
+                 => {
+                    // Note: if `UnexpectedEof` was reached while inside a 
+                    // PixelData Sequence, then we assume that
+                    // the end of a DICOM object was reached gracefully.
+                    self.hard_break = true;
+                    None
+                }
                 Err(e) => {
                     self.hard_break = true;
                     Some(Err(e).context(ReadItemHeaderSnafu))