CFPropertyList 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74e0407ecce8171dfa845b93f5f55e1cd7d386a3
-  data.tar.gz: d3d8e956ad24476ee83293c9f4d25fa23b7f2947
+  metadata.gz: 8ee90589694090934993f07e976e2a3b3d963b0c
+  data.tar.gz: 4724d0d07877da7f55cd4d1670a2f76443c5389f
 SHA512:
-  metadata.gz: 96bc102584b4a4745bcfaa403667644fff60e8be9b2ad9224c454f6b977b236f16156863cc48d20b8aa4cffc0f9f0e4bbea5c05fc7f06450afb49cb37f4aaede
-  data.tar.gz: 9f36e44475f5b7a48d957e54b35ed99a821c3df6ead60598c4fd8a7637bbbb1b9bfa8d5a7a438456ae814696ed52a438dbf94151cf2b29974995716c78a7189a
+  metadata.gz: 5897d5931e85e448f9f8899925971420085af1b78af282161c08890044003f1270080da3937674fce5dad24419dc4662803422b7de51075b419e16798b9e80f4
+  data.tar.gz: 94b561dd3c6b0c0ddfdbec0ea6918183c54e3cda1ca00d80ea05916dc56c3e200aeb65d76f7738782380e0ffd06a874937545ecf27c4f43d26e8baacd08d5234

data/lib/cfpropertylist/rbBinaryCFPropertyList.rb

@@ -123,8 +123,8 @@ module CFPropertyList
 
     # read a binary int value
     def read_binary_int(fname,fd,length)
-      if length > 3
-        raise CFFormatError.new("Integer greater than 8 bytes: #{length}")
+      if length > 4
+        raise CFFormatError.new("Integer greater than 16 bytes: #{length}")
       end
 
       nbytes = 1 << length
@@ -136,17 +136,12 @@ module CFPropertyList
         when 0 then buff.unpack("C")[0]
         when 1 then buff.unpack("n")[0]
         when 2 then buff.unpack("N")[0]
-        when 3
-          hiword,loword = buff.unpack("NN")
-          if (hiword & 0x80000000) != 0
-            # 8 byte integers are always signed, and are negative when bit 63 is
-            # set. Decoding into either a Fixnum or Bignum is tricky, however,
-            # because the size of a Fixnum varies among systems, and Ruby
-            # doesn't consider the number to be negative, and won't sign extend.
-            -(2**63 - ((hiword & 0x7fffffff) << 32 | loword))
-          else
-            hiword << 32 | loword
-          end
+        # 8 byte integers are always signed
+        when 3 then buff.unpack("q>")[0]
+        # 16 byte integers are used to represent unsigned 8 byte integers
+        # where the unsigned value is stored in the lower 8 bytes and the
+        # upper 8 bytes are unused.
+        when 4 then buff.unpack("Q>Q>")[1]
         end
       )
     end
@@ -474,25 +469,19 @@ module CFPropertyList
 
     # Codes an integer to binary format
     def int_to_binary(value)
+      # Note: nbytes is actually an exponent.  number of bytes = 2**nbytes.
       nbytes = 0
-      nbytes = 1  if value > 0xFF # 1 byte integer
-      nbytes += 1 if value > 0xFFFF # 4 byte integer
-      nbytes += 1 if value > 0xFFFFFFFF # 8 byte integer
-      nbytes = 3  if value < 0 # 8 byte integer, since signed
+      nbytes = 1  if value > 0xFF # 1 byte unsigned integer
+      nbytes += 1 if value > 0xFFFF # 4 byte unsigned integer
+      nbytes += 1 if value > 0xFFFFFFFF # 8 byte unsigned integer
+      nbytes += 1 if value > 0x7FFFFFFFFFFFFFFF # 8 byte unsigned integer, stored in lower half of 16 bytes
+      nbytes = 3  if value < 0 # signed integers always stored in 8 bytes
 
       Binary.type_bytes(0b0001, nbytes) <<
-        if nbytes < 3
-          [value].pack(
-            if nbytes == 0    then "C"
-            elsif nbytes == 1 then "n"
-            else "N"
-            end
-          )
-        else
-          # 64 bit signed integer; we need the higher and the lower 32 bit of the value
-          high_word = value >> 32
-          low_word = value & 0xFFFFFFFF
-          [high_word,low_word].pack("NN")
+        if nbytes < 4
+          [value].pack(["C", "n", "N", "q>"][nbytes])
+        else # nbytes == 4
+          [0,value].pack("Q>Q>")
         end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: CFPropertyList
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors:
 - Christian Kruse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Read, write and manipulate both binary and XML property lists as defined