Merge pull request #239 from EatonZ/patch-1

decriptor · web-flow · commit e4c4dd7b55ec · 2021-05-13T22:43:03.000-06:00
Improve JPG detection in GetExtensionFromData
diff --git a/src/TaglibSharp/Picture.cs b/src/TaglibSharp/Picture.cs
@@ -557,7 +557,7 @@ public static string GetExtensionFromData (ByteVector data)
 					ext = ".gif";
 				} else if (data[0] == 'B' && data[1] == 'M') {
 					ext = ".bmp";
-				} else if (data[0] == 0xFF && data[1] == 0xD8 && data[2] == 0xFF && data[3] == 0xE0) {
+				} else if (data[0] == 0xFF && data[1] == 0xD8 && data[data.Count - 2] == 0xFF && data[data.Count - 1] == 0xD9) {
 					ext = ".jpg";
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,7 @@ public static string GetExtensionFromData (ByteVector data)`
`557`	`557`	`ext = ".gif";`
`558`	`558`	`} else if (data[0] == 'B' && data[1] == 'M') {`
`559`	`559`	`ext = ".bmp";`
`560`		`- } else if (data[0] == 0xFF && data[1] == 0xD8 && data[2] == 0xFF && data[3] == 0xE0) {`
	`560`	`+ } else if (data[0] == 0xFF && data[1] == 0xD8 && data[data.Count - 2] == 0xFF && data[data.Count - 1] == 0xD9) {`
`561`	`561`	`ext = ".jpg";`
`562`	`562`	`}`
`563`	`563`