Fixed IsValidRef(). Made bad checks.

empira · Dec 11, 2017 · 1614146 · 1614146
1 parent 3c346c3
commit 1614146
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/src/PdfSharp/Pdf.IO/Parser.cs b/src/PdfSharp/Pdf.IO/Parser.cs
@@ -1107,23 +1107,24 @@ 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);
 
-				int s = Math.Min(ss, eof);
-
-				if (s != es)
+				if (ss != es)
 				{
-					if (s == -1)
+					if (ss == -1)
 						return false;
 					else if (es == -1)
 						break;
-					else if (s < es)
+					else if (ss < es)
 						break;
-					else if (s > es)
+					else if (ss > es)
 						return false;
 				}
 
+				int eof = content.IndexOf("%%EOF", StringComparison.Ordinal);
+                if (eof != -1)
+                    break;
+
 				content_pos = content_pos + read_length;
 				if (content_pos + read_length >= length)
 				{

diff --git a/src/PdfSharp/Pdf.IO/PdfReader.cs b/src/PdfSharp/Pdf.IO/PdfReader.cs
@@ -278,7 +278,7 @@ public static PdfDocument Open(Stream stream, string password, PdfDocumentOpenMo
         public static PdfDocument Open(Stream stream, string password, PdfDocumentOpenMode openmode, PdfPasswordProvider passwordProvider)
         {
             PdfDocument document;
-            try
+            //try
             {
                 Lexer lexer = new Lexer(stream);
                 document = new PdfDocument(lexer);
@@ -497,11 +497,11 @@ public static PdfDocument Open(Stream stream, string password, PdfDocumentOpenMo
                     document._irefTable.CheckConsistence();
                 }
             }
-            catch (Exception ex)
-            {
-                Debug.WriteLine(ex.Message);
-                throw;
-            }
+//             catch (Exception ex)
+//             {
+//                 Debug.WriteLine(ex.Message);
+//                 throw;
+//             }
             return document;
         }