combine_pdf 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b455928d3e64892b983f743f94243bd3850f1324
-  data.tar.gz: '0925ba5c1a7754bd54311ba499329771b0bc36b4'
+  metadata.gz: 26b12c91a180581e3aab431bac1cb46b0d9cecb1
+  data.tar.gz: f9fe760a66b6a8314106faab6c5b2a45a889e440
 SHA512:
-  metadata.gz: 1a382e673cf8c042ed95638d44cb9cd804a52190bc06130ba3d9ae5a5aac564184c13c41b6a44ecbf265590a1ed3fdd97a011c252dc647502295255051fb473c
-  data.tar.gz: 0a77bd1af453712bcff6de7e3fbae6a745c0b3137351c8b147a614aac8d0062feee0044e66cba8e4924213ab7c9020ec5c8087fb9cc5d1258edb7303a23a919b
+  metadata.gz: 72f53db4e8cb69b52fa8044bffe42acb21f683fd39afdd7bbf96a924916775fb2ac338c2fb4f5ddd23d0685d0442ec3acc9ee0416581c9f82b576e86beea6c45
+  data.tar.gz: a555bd19c697042ee8e75742b7a6f0e14282abf650443571bef157c39d4d34d4ab70fa3b7ed7acee9aa49dcd045bacced91ea01fd58f7bb31763614debc8083c

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ***
 
+#### Change log v.1.0.7
+
+**Fix**: Fix an issue where page property inheritance might break PDF structure if there's a conflict between property types (inheritance using properties by reference vs. nested properties), fixing issue #124. Credit to @erikaxel for exposing the issue.
+
+#### Change log v.1.0.6
+
+**Fix**: Fix warnings, issue #120. Credit to @lloeki for exposing the issue.
+
+**Fix**: Fix / add adjustable nesting protection, fixing issue #117. Credit to @emmanuelmillionaer for exposing the issue.
+
 #### Change log v.1.0.5
 
 **Fix**: Fix issue #116 where some PDF objects (the page catalog and some root information data) were written twice to the saved PDF file (or String). Credit to @albertsaave  for exposing the issue using GhostScript.

data/lib/combine_pdf/page_methods.rb

@@ -649,7 +649,6 @@ module CombinePDF
         page_res.each do |k, v|
           v = page_res[k] = v.dup if v.is_a?(Array) || v.is_a?(Hash)
           v = v[:referenced_object] = v[:referenced_object].dup if v.is_a?(Hash) && v[:referenced_object]
-          v = v[:referenced_object] = v[:referenced_object].dup if v.is_a?(Hash) && v[:referenced_object]
         end
       end
       page_copy.instance_exec(secure || @secure_injection) { |s| secure_for_copy if s; init_contents; self }

data/lib/combine_pdf/parser.rb

@@ -516,11 +516,13 @@ module CombinePDF
             catalogs[:Rotate] ||= inheritance_hash[:Rotate] if inheritance_hash[:Rotate]
             if inheritance_hash[:Resources]
               catalogs[:Resources] ||= { referenced_object: {}, is_reference_only: true }.dup
-              (catalogs[:Resources][:referenced_object] || catalogs[:Resources]).update((inheritance_hash[:Resources][:referenced_object] || inheritance_hash[:Resources]), &self.class.method(:hash_update_proc_for_old))
+              catalogs[:Resources] = { referenced_object: catalogs[:Resources], is_reference_only: true } unless catalogs[:Resources][:referenced_object]
+              catalogs[:Resources][:referenced_object].update((inheritance_hash[:Resources][:referenced_object] || inheritance_hash[:Resources]), &self.class.method(:hash_update_proc_for_old))
             end
             if inheritance_hash[:ColorSpace]
               catalogs[:ColorSpace] ||= { referenced_object: {}, is_reference_only: true }.dup
-              (catalogs[:ColorSpace][:referenced_object] || catalogs[:ColorSpace]).update((inheritance_hash[:ColorSpace][:referenced_object] || inheritance_hash[:ColorSpace]), &self.class.method(:hash_update_proc_for_old))
+              catalogs[:ColorSpace] = { referenced_object: catalogs[:ColorSpace], is_reference_only: true } unless catalogs[:ColorSpace][:referenced_object]
+              catalogs[:ColorSpace][:referenced_object].update((inheritance_hash[:ColorSpace][:referenced_object] || inheritance_hash[:ColorSpace]), &self.class.method(:hash_update_proc_for_old))
             end
             # (catalogs[:ColorSpace] ||= {}).update(inheritance_hash[:ColorSpace], &self.class.method(:hash_update_proc_for_old)) if inheritance_hash[:ColorSpace]
             # catalogs[:Order] ||= inheritance_hash[:Order] if inheritance_hash[:Order]

data/lib/combine_pdf/version.rb

@@ -1,3 +1,3 @@
 module CombinePDF
-  VERSION = '1.0.6'.freeze
+  VERSION = '1.0.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-rc4