openpreserve · pmay · May 13, 2016 · May 13, 2016 · Oct 11, 2016 · Oct 11, 2016
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 
 # Ignore IntelliJ files
 .idea
+*.iml
 **/*.iml
 
 # Ignore Maven artefacts

diff --git a/jhove-modules/src/main/java/edu/harvard/hul/ois/jhove/module/PdfModule.java b/jhove-modules/src/main/java/edu/harvard/hul/ois/jhove/module/PdfModule.java
@@ -2426,7 +2426,10 @@ protected PdfObject getObject (int objIndex, int recGuard)
                     }
                 }
                 /* And finally extract the object from the object stream. */
-                return ostrm.getObject (objIndex);
+                /* Need to ensure the object number is set */
+                PdfObject obj = ostrm.getObject (objIndex);
+                obj.setObjNumber (objIndex);
+                return obj;
             }
             catch (Exception e) {
 

diff --git a/jhove-modules/src/main/java/edu/harvard/hul/ois/jhove/module/pdf/PdfFlateInputStream.java b/jhove-modules/src/main/java/edu/harvard/hul/ois/jhove/module/pdf/PdfFlateInputStream.java
@@ -321,7 +321,7 @@ private long skipIISBytes (long n) throws IOException {
             return -1;
         }
         if (iisBufLen - iisBufOff < n) {
-            n = iisBufLen + iisBufOff;
+            n = iisBufLen - iisBufOff;
         }
         iisBufOff += n;
         return n;

diff --git a/jhove-modules/src/test/resources/pdf/ImproperlyConstructedPageTree.pdf b/jhove-modules/src/test/resources/pdf/ImproperlyConstructedPageTree.pdf
diff --git a/jhove-modules/src/test/resources/pdf/InvalidPageDictionary.pdf b/jhove-modules/src/test/resources/pdf/InvalidPageDictionary.pdf
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ @@
     # Ignore IntelliJ files
     .idea
+    *.iml
     **/*.iml
     # Ignore Maven artefacts
@@ Expand Down @@