combine_pdf 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f292c2a6bcd884e255454fbc8da8607e35bd67f4d384bae7f3f24ecf5bab0fd2
-  data.tar.gz: 1e42415199a87b283161390c81304ba566e5db5910aba343b3ad636df3f1f4e1
+  metadata.gz: 065b22eadabeec63902f6ba3bd0fb551ef6cdb37f62e10856f203110a70a23cc
+  data.tar.gz: 30a9b38087298a1de88ad1c76fbfd16133e40b152109bef3d55e372ee993fa80
 SHA512:
-  metadata.gz: abe5f55e7e428216469b5203942409886fca98ba9746a949eba50df24bb82ae5068bcb2de8eec854a00aee9a12155e3c7befded73e154f2dbc0043cb9db62843
-  data.tar.gz: eeeb8e7c3d0e0ab27337dbf04fbb833973904e1f8cd76e2788fdd3dbc12400702f9a6870c18434ca7901030a35fb62d281ad9110c5cc9e3da19b394a9ddaff24
+  metadata.gz: 9df5436a25b1c75819cffd89a35b915e4cd6bdc74703da71a62f7556299fc76297ac7e47dbad72585f158302f6554fb94910487ac2fd31e7f04f632ec9b08744
+  data.tar.gz: 19d9ce8eca5de1ce62e33d5d122946219a74bb35ee86ac87d1db80c6ca9acc4ca3878c31b28cf6a8dc8447f4c30f6d9608b50f61dbcc4713e0e77a581a0dd09f

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ***
 
+#### Change log v.1.0.12
+
+**Fix**: Fixed an issue introduced in version 1.0.11, where a fragmented XREF table might cause the CombinePDF::Parser to fail. Credit to @solasdev for reporting issue #140.
+
 #### Change log v.1.0.11
 
 **Fix**: Fixed an issue where small floating point numbers would produce invalid PDF rendering (where exponent notation was used instead of decimal notation). Credit to @avit (Andrew Vit) for PR #139.

data/lib/combine_pdf/parser.rb

@@ -416,10 +416,8 @@ module CombinePDF
         ## XREF - check for encryption... anything else?
         ##########################################
         elsif @scanner.scan(/xref/)
-          # skip first xref line
-          @scanner.scan(/[\s]+[\d]+[\s]+[\d]+[\s]+/)
-          while @scanner.scan(/[\d]+[\s][\d]+[\s]+[nf][\s]+/)
-            # skip all xref lines
+          # skip list indetifier lines or list lines ([\d] [\d][\r\n]) ot ([\d] [\d] [nf][\r\n])
+          while @scanner.scan(/[\s]*[\d]+[ \t]+[\d]+[ \t\r]*\n[\r]?/) || @scanner.scan(/[ \t]*[\d]+[ \t]+[\d]+[ \t]+[nf][\s]*/)
             nil
           end
         ##########################################
@@ -480,7 +478,7 @@ module CombinePDF
         ##########################################
         else
           # always advance
-          # warn "Advancing for unknown reason... #{@scanner.string[@scanner.pos - 4, 8]} ... #{@scanner.peek(4)}" unless @scanner.peek(1) =~ /[\s\n]/
+          warn "Advancing for unknown reason... #{@scanner.string[@scanner.pos - 4, 8]} ... #{@scanner.peek(4)}" unless @scanner.peek(1) =~ /[\s\n]/
           warn 'Warning: parser advancing for unknown reason. Potential data-loss.'
           @scanner.pos = @scanner.pos + 1
         end

data/lib/combine_pdf/version.rb

@@ -1,3 +1,3 @@
 module CombinePDF
-  VERSION = '1.0.11'.freeze
+  VERSION = '1.0.12'.freeze
 end

data/test/automated

@@ -96,6 +96,7 @@ CombinePDF.load("./Ruby/test\ pdfs/Scribus-unknown_err.pdf").save '08_1-unknown-
 CombinePDF.load("./Ruby/test\ pdfs/Scribus-unknown_err2.pdf").save '08_2-unknown-err-empty-str.pdf'
 CombinePDF.load("./Ruby/test\ pdfs/Scribus-unknown_err3.pdf").save '08_3-unknown-err-empty-str.pdf'
 CombinePDF.load("./Ruby/test\ pdfs/xref_in_middle.pdf").save '08_4-xref-in-middle.pdf'
+CombinePDF.load("./Ruby/test\ pdfs/xref_split.pdf").save '08_5-xref-fragmented.pdf'
 
 CombinePDF.load("/Users/2Be/Ruby/test\ pdfs/nil_object.pdf").save('09_nil_in_parsed_array.pdf')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: combine_pdf
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-rc4