vox-etf 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4435ae55a1631c64aa810ea8f6f0beb899f1e3363498f36cd13b2cd661704a97
-  data.tar.gz: 23df68f172a4d60529e72b40d02c74fbe96a342bacf534aad606047c54543167
+  metadata.gz: 5a6a2cc3e5abff452aed1b87b83f3c9906fa673cdac9251b92051492d7de0ff2
+  data.tar.gz: 2caddaa1b5163345f676d9649c624e9ec2580e770d32dddecd2325800e9845d0
 SHA512:
-  metadata.gz: ca076026d2625686aa7f8f6428ff33a6a7b40571eecb68478ed4684883658854e749e123053544d1861f9bff13b9c8f7d310047afa95ad70ed059036a1b0e4a3
-  data.tar.gz: b708e0871cfae5fb34b74f28024e607684ca386eaf0bc9c9ec9d668a900ab7b3e89f3d2a1b101d4b7fffd3dc870f91c4fb1b11101b01d6ac4e40d0de1b856998
+  metadata.gz: 56ff3b112058ec393869a0532905bad5f27adcd533a7427cacea86ffdbae49b261ca4a258dc33683af52bf0bce0c44fb6554a08b11d99a6c2a1c3862deb1ae8c
+  data.tar.gz: 96482eb0de9485c5938724b8d06d136028907ec99270a0bf46239d33b6313b1ad7207df021206099c11528f3dcbde8faeabdf0ba18f4cb007dad9061dc01f21c

data/ext/vox/decoder.hpp

@@ -362,9 +362,9 @@ namespace etf
         {
             const uint32_t decompressed_size = read32();
 
-            uint64_t source_size = decompressed_size;
+            unsigned long source_size = decompressed_size;
             uint8_t *out_buffer = (uint8_t *)malloc(decompressed_size);
-            const int ret = uncompress(out_buffer, &source_size, (const unsigned char *)(data + offset), (uint64_t)(size - offset));
+            const int ret = uncompress(out_buffer, &source_size, (const unsigned char *)(data + offset), (uLong)(size - offset));
 
             offset += source_size;
             if (ret != Z_OK)

data/ext/vox/encoder.hpp

@@ -99,11 +99,11 @@ namespace etf
 
         void encode_fixnum(VALUE fixnum)
         {
-            long l = FIX2LONG(fixnum);
-            if (l > 0 && l <= 0xFF)
-                erlpack_append_small_integer(erl_buff, (unsigned char)l);
+            uint32_t n = NUM2UINT(fixnum);
+            if (n > 0 && n <= UINT8_MAX)
+                erlpack_append_small_integer(erl_buff, (uint8_t)n);
             else
-                erlpack_append_integer(erl_buff, l);
+                erlpack_append_integer(erl_buff, n);
         }
 
         void encode_bignum(VALUE bignum)
@@ -138,15 +138,20 @@ namespace etf
 
         void encode_array(VALUE array)
         {
-            uint32_t size = RARRAY_LEN(array);
+            uint64_t size = RARRAY_LEN(array);
             if (size == 0)
             {
                 erlpack_append_nil_ext(erl_buff);
                 return;
             }
+            else if (size > UINT32_MAX)
+            {
+                rb_raise(rb_eRangeError, "Array size is too large to fit into a 32 bit integer.");
+                return;
+            }
 
             erlpack_append_list_header(erl_buff, size);
-            for (uint32_t index = 0; index < size; index++)
+            for (size_t index = 0; index < size; index++)
             {
                 encode_object(RARRAY_AREF(array, index));
             }
@@ -166,7 +171,13 @@ namespace etf
 
         void encode_hash(VALUE hash)
         {
-            uint32_t size = RHASH_SIZE(hash);
+            uint64_t size = RHASH_SIZE(hash);
+            if (size > UINT32_MAX)
+            {
+                rb_raise(rb_eRangeError, "Hash size is too large to fit into a 32 bit integer");
+                return;
+            }
+
             erlpack_append_map_header(erl_buff, size);
             VALUE keys = rb_funcall(hash, rb_intern("keys"), 0);
 

data/lib/vox/etf/version.rb

@@ -21,6 +21,6 @@ module Vox
     #   end
 
     # Gem version
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vox-etf
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Matthew Carey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-12 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ETF decoding/encoding for vox.