pdf-reader 2.15.0 → 2.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1be615eb6abc5557e61ba53958c7211fac0f1528e75dc54eff27ffb5554d7c80
-  data.tar.gz: 875221f31dc119cd0f7ae3cc0246b3bbb70f6127c0047ec924c8030e9186b55b
+  metadata.gz: 680d773fb89a823854ce986d7e35c5313df55087d0b4e8bfc3c70c51d97a8130
+  data.tar.gz: 7484cc4e28a01b9a74b869c2dede32a47bfd2519cded7ff6fc421c99d546a406
 SHA512:
-  metadata.gz: 4b4501ca72d06b5a569fdcc77f384131fbd85342f8da7a084a02210ec7a3821e8b9f1cad88685262d0cc4e993f7b0031bed5d510c353c7d8fb5fe28f97a2ea83
-  data.tar.gz: a4fe329f2d8ae7cc295cb17d573963ddab6c0cde52d6524ad182f4651dab8ba90215bcb1ecf60c7fcf248135aed152b50a1d34afa03b270b93c5a172ac4048b3
+  metadata.gz: e9b2ad3cfb37fb76f731d646bf5097e0334d88b3f7e5ba39abfe9530e51a7dbcfcf08a75d81b6cc1e17f2b18015a25f3ef9ef0d9b75b0d5763eb38470263ee49
+  data.tar.gz: 7acdc84e89045708ac4c983deefa2bb1a6246f1a57d8d9a809efeb3b1477d69921238067b797f78d2b7a33eff9bd54c03e139fd4bed10102f365a4d48e8899a0

data/CHANGELOG

@@ -1,5 +1,9 @@
-v2.15.0 (13th August 2025)
+v2.15.1 (28th December 2025)
+- Add ruby 4.0 to the CI matrix (https://github.com/yob/pdf-reader/pull/575)
+- Avoiding raising an error when ToUnicode poins to the wrong object type (https://github.com/yob/pdf-reader/pull/573)
+- Skip invalid UTF-16 surrogate pairs in CMaps (https://github.com/yob/pdf-reader/pull/574)
 
+v2.15.0 (13th August 2025)
 - Overhaul sorbet types, moving from an external RBI file to inline comments in RBS syntax
   - multiple PRs, but mainly https://github.com/yob/pdf-reader/pull/562
   - See https://railsatscale.com/2025-04-23-rbs-support-for-sorbet/

data/lib/pdf/reader/cmap.rb

@@ -46,6 +46,10 @@ class PDF::Reader
       "def" => :noop
     } #: Hash[String, Symbol]
 
+    # Indicates the start of a UTF-16 surrogate pair, see
+    # https://en.wikipedia.org/wiki/Universal_Character_Set_characters
+    HIGH_SURROGATE_RANGE = (0xD800..0xDBFF) #: Range[Integer]
+
     #: Hash[Integer, Array[Integer]]
     attr_reader :map
 
@@ -124,15 +128,16 @@ class PDF::Reader
       end
       result = []
       while unpacked_string.any? do
-        if unpacked_string.size >= 2 &&
-            unpacked_string.first.to_i >= 0xD800 &&
-            unpacked_string.first.to_i <= 0xDBFF
+        if unpacked_string.size >= 2 && HIGH_SURROGATE_RANGE.include?(unpacked_string.first.to_i)
           # this is a Unicode UTF-16 "Surrogate Pair" see Unicode Spec. Chapter 3.7
           # lets convert to a UTF-32. (the high bit is between 0xD800-0xDBFF, the
           # low bit is between 0xDC00-0xDFFF) for example: U+1D44E (U+D835 U+DC4E)
           point_one = unpacked_string.shift.to_i
           point_two = unpacked_string.shift.to_i
           result << (point_one - 0xD800) * 0x400 + (point_two - 0xDC00) + 0x10000
+        elsif unpacked_string.size == 1 && HIGH_SURROGATE_RANGE.include?(unpacked_string.first.to_i)
+            # the start of a surrogate pair but the pair is missing. Skip it
+            unpacked_string.shift
         else
           result << unpacked_string.shift
         end

data/lib/pdf/reader/font.rb

@@ -235,9 +235,17 @@ class PDF::Reader
 
       if obj[:ToUnicode]
         # ToUnicode is optional for Type1 and Type3
-        stream = @ohash.deref_stream(obj[:ToUnicode])
-        if stream
-          @tounicode = PDF::Reader::CMap.new(stream.unfiltered_data)
+        begin
+          stream = @ohash.deref_stream(obj[:ToUnicode])
+          if stream
+            @tounicode = PDF::Reader::CMap.new(stream.unfiltered_data)
+          end
+        rescue PDF::Reader::MalformedPDFError => e
+          # If ToUnicode exists but isn't a stream, lets pretend it didn't exist. We
+          # can't do anything with it unless it's a stream with a CMap
+          unless e.message == "expected object to be a Stream or nil"
+            raise e
+          end
         end
       end
     end

data/rbi/pdf-reader.rbi

@@ -282,6 +282,7 @@ class PDF::Reader::CMap
 end
 
 PDF::Reader::CMap::CMAP_KEYWORDS = T.let(T.unsafe(nil), Hash)
+PDF::Reader::CMap::HIGH_SURROGATE_RANGE = T.let(T.unsafe(nil), Range)
 
 class PDF::Reader::CidWidths
   extend ::Forwardable
@@ -537,7 +538,9 @@ class PDF::Reader::Font
   sig { params(obj: T::Hash[::Symbol, T.untyped]).returns(::PDF::Reader::Encoding) }
   def build_encoding(obj); end
 
-  sig { returns(T.untyped) }
+  sig do
+    returns(T.any(::PDF::Reader::WidthCalculator::BuiltIn, ::PDF::Reader::WidthCalculator::Composite, ::PDF::Reader::WidthCalculator::TrueType, ::PDF::Reader::WidthCalculator::TypeOneOrThree, ::PDF::Reader::WidthCalculator::TypeZero))
+  end
   def build_width_calculator; end
 
   sig { params(font_name: T.nilable(T.any(::String, ::Symbol))).returns(::PDF::Reader::Encoding) }
@@ -573,6 +576,8 @@ class PDF::Reader::Font
   def unpack_string_to_array_of_ints(unpack_me, unpack_arg); end
 end
 
+PDF::Reader::Font::WidthCalculator = T.type_alias { T.any(::PDF::Reader::WidthCalculator::BuiltIn, ::PDF::Reader::WidthCalculator::Composite, ::PDF::Reader::WidthCalculator::TrueType, ::PDF::Reader::WidthCalculator::TypeOneOrThree, ::PDF::Reader::WidthCalculator::TypeZero) }
+
 class PDF::Reader::FontDescriptor
   sig { params(ohash: ::PDF::Reader::ObjectHash, fd_hash: T::Hash[T.untyped, T.untyped]).void }
   def initialize(ohash, fd_hash); end
@@ -950,7 +955,9 @@ class PDF::Reader::ObjectHash
   sig { returns(::Float) }
   def pdf_version; end
 
-  sig { returns(T.untyped) }
+  sig do
+    returns(T.any(::PDF::Reader::AesV2SecurityHandler, ::PDF::Reader::AesV3SecurityHandler, ::PDF::Reader::NullSecurityHandler, ::PDF::Reader::Rc4SecurityHandler, ::PDF::Reader::UnimplementedSecurityHandler))
+  end
   def sec_handler; end
 
   sig { returns(T::Boolean) }
@@ -1037,6 +1044,8 @@ class PDF::Reader::ObjectHash
   def xref; end
 end
 
+PDF::Reader::ObjectHash::SecurityHandler = T.type_alias { T.any(::PDF::Reader::AesV2SecurityHandler, ::PDF::Reader::AesV3SecurityHandler, ::PDF::Reader::NullSecurityHandler, ::PDF::Reader::Rc4SecurityHandler, ::PDF::Reader::UnimplementedSecurityHandler) }
+
 class PDF::Reader::ObjectStream
   sig { params(stream: ::PDF::Reader::Stream).void }
   def initialize(stream); end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdf-reader
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.15.1
 platform: ruby
 authors:
 - James Healy
@@ -307,9 +307,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/yob/pdf-reader/issues
-  changelog_uri: https://github.com/yob/pdf-reader/blob/v2.15.0/CHANGELOG
-  documentation_uri: https://www.rubydoc.info/gems/pdf-reader/2.15.0
-  source_code_uri: https://github.com/yob/pdf-reader/tree/v2.15.0
+  changelog_uri: https://github.com/yob/pdf-reader/blob/v2.15.1/CHANGELOG
+  documentation_uri: https://www.rubydoc.info/gems/pdf-reader/2.15.1
+  source_code_uri: https://github.com/yob/pdf-reader/tree/v2.15.1
 rdoc_options:
 - "--title"
 - PDF::Reader Documentation