IsValidXref() no will no longer check if it's inside of a stream beyo…

…ng an EOF symbol.
empira · Nov 14, 2017 · 3c346c3 · 3c346c3
1 parent 0e54078
commit 3c346c3
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/PdfSharp/Pdf.IO/Parser.cs b/src/PdfSharp/Pdf.IO/Parser.cs
@@ -1107,17 +1107,21 @@ private bool IsValidXref()
 				content += _lexer.ReadRawString(content_pos, read_length);
 
 				int ss = content.IndexOf("stream", StringComparison.Ordinal);
+				int eof = content.IndexOf("%%EOF", StringComparison.Ordinal);
 				int es = content.IndexOf("endstream", StringComparison.Ordinal);
 
-				if (ss < es)
-				{
-					// Not inside of stream
-					break;
-				}
-				else if (ss > es)
+				int s = Math.Min(ss, eof);
+
+				if (s != es)
 				{
-					// inside of stream
-					return false;
+					if (s == -1)
+						return false;
+					else if (es == -1)
+						break;
+					else if (s < es)
+						break;
+					else if (s > es)
+						return false;
 				}
 
 				content_pos = content_pos + read_length;