Merge pull request #86 from kaksmet/app14-length

kaksmet · web-flow · commit 35c080d7dca4 · 2018-05-02T05:06:37.000Z
Allow Adobe APP14 segments to be longer than 12 bytes
diff --git a/src/parser.rs b/src/parser.rs
@@ -487,7 +487,7 @@ pub fn parse_app<R: Read>(reader: &mut R, marker: Marker) -> Result<Option<AppDa
             }
         },
         APP(14) => {
-            if length == 12 {
+            if length >= 12 {
                 let mut buffer = [0u8; 12];
                 reader.read_exact(&mut buffer)?;
                 bytes_read = buffer.len();

Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,7 @@ pub fn parse_app<R: Read>(reader: &mut R, marker: Marker) -> Result<Option<AppDa`
`487`	`487`	`}`
`488`	`488`	`},`
`489`	`489`	`APP(14) => {`
`490`		`- if length == 12 {`
	`490`	`+ if length >= 12 {`
`491`	`491`	`let mut buffer = [0u8; 12];`
`492`	`492`	`reader.read_exact(&mut buffer)?;`
`493`	`493`	`bytes_read = buffer.len();`