cztop 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4906ff9fd7c2ebd3fb3b33eadcab389799649ff
-  data.tar.gz: 0332b4b9a1fed07870e459298ca43fb82223acd8
+  metadata.gz: 8f1316481428acef63d4abeb76be289cd66c68b8
+  data.tar.gz: af1ab69820e817b6610d5aa776974c89d492e3d4
 SHA512:
-  metadata.gz: 8727db3d61b640eb5a2e0611086d180f6515418d7fd4ecebd6ff6fd76e15f82fb10116e2420121c4dc8279bf11b426604228971d03d646f244d8886735475db7
-  data.tar.gz: 838b219829c9df9f8fc04081d3e262360bda1cf02f5c5d7e8881c2593e4aa7921a1ecaea54fd0e344a091d0cc5e1338267375ab6758ab1eb60b652fc4db2bfd5
+  metadata.gz: cfab10569af81b300ba07b378daddab55ff32445b4002af600c8dbe44e6c79908f740f53a5c20f09dac6db477c32a7486e66237d503741b04c8d03045264e8aa
+  data.tar.gz: d8160d639ede7013d1163c7ca770fbfa1a2fa7ef985c3b8cb5a6b1ca8ffea012e78e27223ddf2a85b0ccda03f18dc85734c3fd039e64a41e97bb80296d69789b

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.11.1 (11/16/2016)
+-----
+* Metadata.load: check for incomplete property names and values
+
 0.11.0 (11/06/2016)
 -----
 * upgrade to czmq-ffi-gen's 0.12.x line (which includes the CZMQ v4.0.0 release)

data/Guardfile

@@ -28,7 +28,7 @@ group :spec do
     watch(rspec.spec_files)
     spec_files = rspec.spec_files
 
-  #  # Ruby files
+    # Ruby files
     ruby = dsl.ruby
     watch(ruby.lib_files) { |m| rspec.spec.(m[1]) }
     ruby_lib_files = ruby.lib_files

data/lib/cztop/metadata.rb

@@ -22,6 +22,8 @@ module CZTop
 
 
     # @param metadata [Hash<Symbol, #to_s>]
+    # @raise [ArgumentError] when properties have an invalid, too long, or
+    #   duplicated name, or when a value is too long
     # @return [String]
     def self.dump(metadata)
       ic_names = Set.new
@@ -44,24 +46,31 @@ module CZTop
       end.join
     end
 
-    # @param string [String, Frame, #to_s]
+    # @param data [String, Frame, #to_s] the data representing the metadata
     # @return [Hash]
-    def self.load(string)
+    def self.load(data)
       properties = {}
-      io = StringIO.new(string)
-      until io.eof?
-        # check for zero length names
-        name_length = io.read(1).unpack("C").first
+      consumed = 0
+      while consumed < data.bytesize # while there are bytes to read
+        # read property name
+        name_length = data.byteslice(consumed).unpack("C").first # never nil
         raise InvalidData, "zero-length property name" if name_length.zero?
-        name = io.read(name_length)
+        name = data.byteslice(consumed + 1, name_length)
+        raise InvalidData, "incomplete name" if name.bytesize != name_length
         name_sym = name.to_sym.downcase
         if properties.has_key?(name_sym)
           raise InvalidData, "property #{name.inspect}: duplicate name"
         end
+        consumed += 1 + name.bytesize
 
-        value_length = io.read(4).unpack("N").first
-        value = io.read(value_length)
+        # read property value
+        value_length = data.byteslice(consumed, 4).unpack("N").first or
+          raise InvalidData, "incomplete length"
+        value = data.byteslice(consumed + 4, value_length)
+        raise InvalidData, "incomplete value" if value.bytesize != value_length
+        consumed += 4 + value.bytesize
 
+        # remember
         properties[name_sym] = value
       end
       new(properties)

data/lib/cztop/version.rb

@@ -1,3 +1,3 @@
 module CZTop
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cztop
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Patrik Wenger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-06 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: czmq-ffi-gen