CFPropertyList 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c734531a6c132c8d3c52ae8ad388a1bcc88584a060349c9430835a768d518bba
-  data.tar.gz: 3d8f7d928e5a7bb1bddef3caae9b3785b071dc295fa727ef2163d255a882ae44
+  metadata.gz: f000bdc67bb044df320d7afd97a7d721669dc90939a5dcfa4ec3138cc88a6950
+  data.tar.gz: 693e1dda1acc30bac87f29076a8704ef8ea171bec3c088c3bead7871139e23e4
 SHA512:
-  metadata.gz: e5be43e0290ffc2761a8830ce34d4b0a6d088b3c178050650242f6f9289b38b207474be6e045fd89c0a9e5ad7651739b7f0d6e48d083aad5e05a1d4175ad0384
-  data.tar.gz: ccf92743adea6007c999e80aaf44ff7e882007b71ce458a11a2acc2fe117c866f2091932252d3ff4388a2a6381dff465bfbe58b18c66c6579c31dc389d386df5
+  metadata.gz: ea3294565339dd9a35c8b83e13e46c121843b90f51e645e5fac5568f39f1d21b8f2348ea950f9b8be4a44591a8d518a9955819118993e87972ee5b1012ad1b98
+  data.tar.gz: c20f731f5c4aae32432c37169c51de6de04d2706d68fe3d4413180dd57ede0494e667341473c4edae3dd49826f9b314630c59bef0d89d2c0196b22bb59d530d5

data/lib/cfpropertylist/rbBinaryCFPropertyList.rb

@@ -5,6 +5,8 @@ require 'stringio'
 module CFPropertyList
   # Binary PList parser class
   class Binary
+    MAX_DEPTH = 512
+
     # Read a binary plist file
     def load(opts)
       @unique_table = {}
@@ -31,11 +33,12 @@ module CFPropertyList
       buff = fd.read(32)
 
       offset_size, object_ref_size, number_of_objects, top_object, table_offset = buff.unpack "x6CCx4Nx4Nx4N"
+      raise CFFormatError.new("#{file}: Invalid offset_size #{offset_size}") unless [1, 2, 3, 4].include?(offset_size)
 
       # after that, get the offset table
       fd.seek(table_offset, IO::SEEK_SET)
       coded_offset_table = fd.read(number_of_objects * offset_size)
-      raise CFFormatError.new("#{file}: Format error!") unless coded_offset_table.bytesize == number_of_objects * offset_size
+      raise CFFormatError.new("#{file}: Format error!") unless coded_offset_table && coded_offset_table.bytesize == number_of_objects * offset_size
 
       @count_objects = number_of_objects
 
@@ -214,28 +217,18 @@ module CFPropertyList
 
     # Convert the given string from one charset to another
     def Binary.charset_convert(str,from,to="UTF-8")
-      return str.dup.force_encoding(from).encode(to) if str.respond_to?("encode")
-      Iconv.conv(to,from,str)
+      str.dup.force_encoding(from).encode(to)
     end
 
     # Count characters considering character set
     def Binary.charset_strlen(str,charset="UTF-8")
-      if str.respond_to?(:encode)
-        size = str.length
-      else
-        utf8_str = Iconv.conv("UTF-8",charset,str)
-        size = utf8_str.scan(/./mu).size
-      end
+      size = str.length
 
       # UTF-16 code units in the range D800-DBFF are the beginning of
       # a surrogate pair, and count as one additional character for
       # length calculation.
       if charset =~ /^UTF-16/
-        if str.respond_to?(:encode)
-          str.bytes.to_a.each_slice(2) { |pair| size += 1 if (0xd8..0xdb).include?(pair[0]) }
-        else
-          str.split('').each_slice(2) { |pair| size += 1 if ("\xd8".."\xdb").include?(pair[0]) }
-        end
+        str.bytes.to_a.each_slice(2) { |pair| size += 1 if (0xd8..0xdb).include?(pair[0]) }
       end
 
       size
@@ -264,7 +257,7 @@ module CFPropertyList
     end
 
     # Read an binary array value, including contained objects
-    def read_binary_array(fname,fd,length)
+    def read_binary_array(fname,fd,length,depth=0)
       ary = []
 
       # first: read object refs
@@ -274,7 +267,7 @@ module CFPropertyList
 
         # now: read objects
         0.upto(length-1) do |i|
-          object = read_binary_object_at(fname,fd,objects[i])
+          object = read_binary_object_at(fname,fd,objects[i],depth+1)
           ary.push object
         end
       end
@@ -284,7 +277,7 @@ module CFPropertyList
     protected :read_binary_array
 
     # Read a dictionary value, including contained objects
-    def read_binary_dict(fname,fd,length)
+    def read_binary_dict(fname,fd,length,depth=0)
       dict = {}
 
       # first: read keys
@@ -298,8 +291,8 @@ module CFPropertyList
 
         # read real keys and objects
         0.upto(length-1) do |i|
-          key = read_binary_object_at(fname,fd,keys[i])
-          object = read_binary_object_at(fname,fd,objects[i])
+          key = read_binary_object_at(fname,fd,keys[i],depth+1)
+          object = read_binary_object_at(fname,fd,objects[i],depth+1)
           dict[key.value] = object
         end
       end
@@ -310,7 +303,7 @@ module CFPropertyList
 
     # Read an object type byte, decode it and delegate to the correct
     # reader function
-    def read_binary_object(fname,fd)
+    def read_binary_object(fname,fd,depth=0)
       # first: read the marker byte
       buff = fd.read(1)
 
@@ -321,7 +314,7 @@ module CFPropertyList
       object_type = buff[0][0].chr
 
       if(object_type != "0" && object_length == 15) then
-        object_length = read_binary_object(fname,fd)
+        object_length = read_binary_object(fname,fd,depth)
         object_length = object_length.value
       end
 
@@ -343,18 +336,19 @@ module CFPropertyList
       when '8'
         CFUid.new(read_binary_int(fname, fd, object_length).value)
       when 'a' # array
-        read_binary_array(fname,fd,object_length)
+        read_binary_array(fname,fd,object_length,depth)
       when 'd' # dictionary
-        read_binary_dict(fname,fd,object_length)
+        read_binary_dict(fname,fd,object_length,depth)
       end
     end
     protected :read_binary_object
 
     # Read an object type byte at position $pos, decode it and delegate to the correct reader function
-    def read_binary_object_at(fname,fd,pos)
+    def read_binary_object_at(fname,fd,pos,depth=0)
+      raise CFFormatError.new("#{fname}: Maximum depth exceeded") if depth > MAX_DEPTH
       position = @offsets[pos]
       fd.seek(position,IO::SEEK_SET)
-      read_binary_object(fname,fd)
+      read_binary_object(fname,fd,depth)
     end
     protected :read_binary_object_at
 

data/lib/cfpropertylist/rbCFPropertyList.rb

@@ -80,8 +80,7 @@ require dirname + '/rbPlainCFPropertyList.rb'
 
 begin
   require dirname + '/rbLibXMLParser.rb'
-  temp = LibXML::XML::Parser::Options::NOBLANKS # check if we have a version with parser options
-  temp = false # avoid a warning
+  _ = LibXML::XML::Parser::Options::NOBLANKS # check if we have a version with parser options
   try_nokogiri = false
   CFPropertyList.xml_parser_interface = CFPropertyList::LibXMLParser
 rescue LoadError, NameError

data/lib/cfpropertylist/rbCFTypes.rb

@@ -60,7 +60,7 @@ module CFPropertyList
     end
 
     def to_plain(plist)
-      if @value =~ /^\w+$/
+      if @value =~ /\A\w+\z/
         @value
       else
         quoted
@@ -74,7 +74,7 @@ module CFPropertyList
         when '"'
           '\\"'
         when '\\'
-          '\\'
+          '\\\\'
         when "\a"
           "\\a"
         when "\b"
@@ -82,7 +82,7 @@ module CFPropertyList
         when "\f"
           "\\f"
         when "\n"
-          "\n"
+          "\\n"
         when "\v"
           "\\v"
         when "\r"

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: CFPropertyList
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Christian Kruse
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-15 00:00:00.000000000 Z
+date: 2025-11-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rexml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: nkf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: base64
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +91,7 @@ homepage: https://github.com/ckruse/CFPropertyList
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -148,8 +106,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Read, write and manipulate both binary and XML property lists as defined
   by apple