CFPropertyList 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d47e329300e952348ef2999d7df0ab8d67e54835
-  data.tar.gz: a59f3e114e6deb519f0b8533187b7af42a95a901
+  metadata.gz: f2981869849555b1191a490d703cc2f79bb322a6
+  data.tar.gz: ffed3e7815aed638c812435432fa0a793af3d39d
 SHA512:
-  metadata.gz: 4f3f08fea23ddcb0f0d407f9344853951929329cd6ea113d188d4b8a90f60d62edb8fcc1648778743ceaf69c6ee14a8148bbaede198207088f6cf333d830cd0c
-  data.tar.gz: 38cbae8fa0cdd6d30d5c08cfa741d5dc9e523a9507b2f8e17ef87f545fc9c3ca01e71ac52e4d7636aa495211c852942be6663358ece253c2f02204609f341a68
+  metadata.gz: 95b2b7dcb15553efdd3d5dd80cb0f5d5ff28a0e0c8431a27bc6a896ddb74bd050516d4c58a8373a62302d9a124ccb2a6768562157f43c2276408cc2cc16ed8e5
+  data.tar.gz: a8e86273c778acdfe0335b481f8fed5f15002a6af6adba33908b9f979d21d075bc2d1249d52f8e4d5701395174359c36cf9416c4e3f7274c2025c62d7c09f1e4

data/lib/rbBinaryCFPropertyList.rb

@@ -258,6 +258,16 @@ module CFPropertyList
     end
     protected :read_binary_unicode_string
 
+    def unpack_with_size(nbytes, buff)
+      format = ["C*", "n*", "N*", "N*"][nbytes - 1];
+
+      if nbytes == 3
+        buff = "\0" + buff.scan(/.{1,3}/).join("\0")
+      end
+
+      return buff.unpack(format)
+    end
+
     # Read an binary array value, including contained objects
     def read_binary_array(fname,fd,length)
       ary = []
@@ -265,7 +275,7 @@ module CFPropertyList
       # first: read object refs
       if(length != 0)
         buff = fd.read(length * @object_ref_size)
-        objects = buff.unpack(@object_ref_size == 1 ? "C*" : "n*")
+        objects = unpack_with_size(@object_ref_size, buff) #buff.unpack(@object_ref_size == 1 ? "C*" : "n*")
 
         # now: read objects
         0.upto(length-1) do |i|
@@ -285,11 +295,11 @@ module CFPropertyList
       # first: read keys
       if(length != 0) then
         buff = fd.read(length * @object_ref_size)
-        keys = buff.unpack(@object_ref_size == 1 ? "C*" : "n*")
+        keys = unpack_with_size(@object_ref_size, buff) #buff.unpack(@object_ref_size == 1 ? "C*" : "n*")
 
         # second: read object refs
         buff = fd.read(length * @object_ref_size)
-        objects = buff.unpack(@object_ref_size == 1 ? "C*" : "n*")
+        objects = unpack_with_size(@object_ref_size, buff) #buff.unpack(@object_ref_size == 1 ? "C*" : "n*")
 
         # read real keys and objects
         0.upto(length-1) do |i|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: CFPropertyList
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Christian Kruse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake