hexapdf 0.32.1 → 0.32.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bee477049a8d45aa858093fa683fef19c4760626c3368bf782b74ca10c26d4e1
-  data.tar.gz: e543e4d73eaf80d6f6e434e499715de454f43fb7dae789773282236c2154bc57
+  metadata.gz: f0907362b897b39d61fa8f859510ccfb31ebd5ad88b94a9e36ff62c62fae813a
+  data.tar.gz: 469465941253bad5e769fc0dd5a57e437c578fdecda52a0fea908370ef8b7169
 SHA512:
-  metadata.gz: d2204bac09267cc3459511a4580480b6157dc5eceafd34c61881dbbcc5c52cc457e7862b3d888d0aa5b8260470b38febf2779ee442f697ce971f82044d81f7ee
-  data.tar.gz: b77bbcb040ab16e98d3023447a96d7d942a8c80613969bece44ee96427d9235d6db25446dc1ddf6db6ba1f9d0010f4d4f076fdc7ee189947e7ab4cf94a871807
+  metadata.gz: 2fc77d33ddc2c6fb377a778b82f92f01fed93d9a4e494cd57c97dc0a00fce4baa7cab185776f8a3303507d68b544e4404ac2f33b72c3b1a7cc7c65ee838c7dd7
+  data.tar.gz: 21a08984f424b91594a2d8e6fc705a7f9458a990918ee77adef469e758ae2fee976ba905a7a4a696c5c2728831d02f8845dc9b5316c28de4ff5c7f062521a7e3

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.32.2 - 2023-05-06
+
+### Changed
+
+* Cross-reference table reconstruction to be more relaxed concerning the
+  `endobj` keyword
+
+### Fixed
+
+* [HexaPDF::Type::ObjectStream] to not compress any encryption dictionary
+  instead of only the current one
+
+
 ## 0.32.1 - 2023-04-20
 
 ### Added

data/lib/hexapdf/cli.rb

@@ -62,6 +62,10 @@ module HexaPDF
       Application.new.parse(args)
     rescue StandardError => e
       $stderr.puts "Problem encountered: #{e.message}"
+      unless e.kind_of?(HexaPDF::Error)
+        $stderr.puts "--> The problem might indicate a faulty PDF or a bug in HexaPDF."
+        $stderr.puts "--> Please report this at https://github.com/gettalong/hexapdf/issues - thanks!"
+      end
       exit(1)
     end
 

data/lib/hexapdf/parser.rb

@@ -458,7 +458,7 @@ module HexaPDF
               linearized = obj.kind_of?(Hash) && obj.key?(:Linearized)
               @tokenizer.pos = pos
             end
-            @tokenizer.scan_until(/(?:\n|\r\n?)endobj\b/)
+            @tokenizer.scan_until(/\bendobj\b/)
           end
         elsif token.kind_of?(Tokenizer::Token) && token == 'trailer'
           obj = @tokenizer.next_object rescue nil

data/lib/hexapdf/type/object_stream.rb

@@ -172,13 +172,16 @@ module HexaPDF
         serializer = Serializer.new
         obj_to_stm = {}
 
-        encrypt_dict = document.trailer[:Encrypt]
+        is_encrypt_dict = document.revisions.each.with_object({}) do |rev, hash|
+          hash[rev.trailer[:Encrypt]] = true
+        end
         while index < objects.size / 2
           obj = revision.object(objects[index])
 
           # Due to a bug in Adobe Acrobat, the Catalog may not be in an object stream if the
           # document is encrypted
-          if obj.nil? || obj.null? || obj.gen != 0 || obj.kind_of?(Stream) || obj == encrypt_dict ||
+          if obj.nil? || obj.null? || obj.gen != 0 || obj.kind_of?(Stream) ||
+              is_encrypt_dict[obj] ||
               obj.type == :Catalog ||
               obj.type == :Sig || obj.type == :DocTimeStamp ||
               (obj.respond_to?(:key?) && obj.key?(:ByteRange) && obj.key?(:Contents))

data/lib/hexapdf/version.rb

@@ -37,6 +37,6 @@
 module HexaPDF
 
   # The version of HexaPDF.
-  VERSION = '0.32.1'
+  VERSION = '0.32.2'
 
 end

data/test/hexapdf/test_parser.rb

@@ -609,7 +609,7 @@ describe HexaPDF::Parser do
     end
 
     it "serially parses the contents" do
-      create_parser("1 0 obj\n5\nendobj\n1 0 obj\n6\nendobj\ntrailer\n<</Size 1>>")
+      create_parser("1 0 obj\n5 endobj\n1 0 obj\n6\nendobj\ntrailer\n<</Size 1>>")
       assert_equal(6, @parser.load_object(@xref).value)
     end
 

data/test/hexapdf/test_writer.rb

@@ -40,7 +40,7 @@ describe HexaPDF::Writer do
       219
       %%EOF
       3 0 obj
-      <</Producer(HexaPDF version 0.32.1)>>
+      <</Producer(HexaPDF version 0.32.2)>>
       endobj
       xref
       3 1
@@ -72,7 +72,7 @@ describe HexaPDF::Writer do
       141
       %%EOF
       6 0 obj
-      <</Producer(HexaPDF version 0.32.1)>>
+      <</Producer(HexaPDF version 0.32.2)>>
       endobj
       2 0 obj
       <</Length 10>>stream
@@ -214,7 +214,7 @@ describe HexaPDF::Writer do
       <</Type/Page/MediaBox[0 0 595 842]/Parent 2 0 R/Resources<<>>>>
       endobj
       5 0 obj
-      <</Producer(HexaPDF version 0.32.1)>>
+      <</Producer(HexaPDF version 0.32.2)>>
       endobj
       4 0 obj
       <</Root 1 0 R/Info 5 0 R/Size 6/Type/XRef/W[1 1 2]/Index[0 6]/Filter/FlateDecode/DecodeParms<</Columns 4/Predictor 12>>/Length 33>>stream

data/test/hexapdf/type/test_object_stream.rb

@@ -23,9 +23,14 @@ describe HexaPDF::Type::ObjectStream do
   before do
     @doc = Object.new
     @doc.instance_variable_set(:@version, '1.5')
-    def (@doc).trailer
-      @trailer ||= {Encrypt: HexaPDF::Object.new({}, oid: 9)}
+    @doc.define_singleton_method(:revisions) do
+      rev1 = Object.new
+      def rev1.trailer; {Encrypt: HexaPDF::Object.new({}, oid: 10)}; end
+      rev2 = Object.new
+      def rev2.trailer; {Encrypt: HexaPDF::Object.new({}, oid: 9)}; end
+      @revisions ||= [rev1, rev2]
     end
+    @doc.define_singleton_method(:trailer) { revisions.last.trailer }
     @obj = HexaPDF::Type::ObjectStream.new({N: 2, First: 8}, oid: 1, document: @doc,
                                            stream: "1 0 5 2 5 [1 2]")
   end
@@ -96,8 +101,9 @@ describe HexaPDF::Type::ObjectStream do
       assert_equal("", @obj.stream)
     end
 
-    it "doesn't allow the encryption dictionary to be compressed" do
+    it "doesn't allow an encryption dictionary to be compressed" do
       @obj.add_object(@doc.trailer[:Encrypt])
+      @obj.add_object(@doc.revisions[0].trailer[:Encrypt])
       @obj.write_objects(@revision)
       assert_equal(0, @obj.value[:N])
       assert_equal(0, @obj.value[:First])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexapdf
 version: !ruby/object:Gem::Version
-  version: 0.32.1
+  version: 0.32.2
 platform: ruby
 authors:
 - Thomas Leitner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2023-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cmdparse