erlectricity 1.1.0 → 1.1.1

data/History.txt

@@ -1,3 +1,9 @@
+== 1.1.1 / 2009-10-28
+  * Bug Fixes
+    * Fix bignum encoding
+    * Prevent stack overflow for massive binaries in c decoder
+    * Optimize strings in c decoder
+
 == 1.1.0 / 2009-10-08
   * Minor Improvements
     * Implement Bignum encoding

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:major: 1
 :minor: 1
-:patch: 0
+:patch: 1
+:major: 1

data/erlectricity.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{erlectricity}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Fleckenstein", "Tom Preston-Werner"]
-  s.date = %q{2009-10-08}
+  s.date = %q{2009-10-28}
   s.email = %q{tom@mojombo.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [

data/ext/decoder.c

@@ -97,7 +97,7 @@ VALUE read_large_tuple(unsigned char **pData) {
     rb_raise(rb_eStandardError, "Invalid Type, not a large tuple");
   }
 
-  int arity = read_4(pData);
+  unsigned int arity = read_4(pData);
 
   VALUE array = rb_ary_new2(arity);
 
@@ -114,7 +114,7 @@ VALUE read_list(unsigned char **pData) {
     rb_raise(rb_eStandardError, "Invalid Type, not an erlang list");
   }
 
-  int size = read_4(pData);
+  unsigned int size = read_4(pData);
 
   VALUE newref_class = rb_const_get(mErlectricity, rb_intern("List"));
   VALUE array = rb_funcall(newref_class, rb_intern("new"), 1, INT2NUM(size));
@@ -131,7 +131,7 @@ VALUE read_list(unsigned char **pData) {
 
 // primitives
 
-void read_string_raw(unsigned char *dest, unsigned char **pData, int length) {
+void read_string_raw(unsigned char *dest, unsigned char **pData, unsigned int length) {
   memcpy((char *) dest, (char *) *pData, length);
   *(dest + length) = (unsigned char) 0;
   *pData += length;
@@ -142,12 +142,12 @@ VALUE read_bin(unsigned char **pData) {
     rb_raise(rb_eStandardError, "Invalid Type, not an erlang binary");
   }
 
-  int length = read_4(pData);
+  unsigned int length = read_4(pData);
 
-  unsigned char buf[length + 1];
-  read_string_raw(buf, pData, length);
+  VALUE rStr = rb_str_new((char *) *pData, length);
+  *pData += length;
 
-  return rb_str_new((char *) buf, length);
+  return rStr;
 }
 
 VALUE read_string(unsigned char **pData) {
@@ -156,16 +156,13 @@ VALUE read_string(unsigned char **pData) {
   }
 
   int length = read_2(pData);
-
-  unsigned char buf[length + 1];
-  read_string_raw(buf, pData, length);
-
   VALUE newref_class = rb_const_get(mErlectricity, rb_intern("List"));
   VALUE array = rb_funcall(newref_class, rb_intern("new"), 1, INT2NUM(length));
 
   int i = 0;
   for(i; i < length; ++i) {
-    rb_ary_store(array, i, INT2NUM(*(buf + i)));
+    rb_ary_store(array, i, INT2NUM(**pData));
+    *pData += 1;
   }
 
   return array;

data/lib/erlectricity/encoder.rb

@@ -101,10 +101,10 @@ module Erlectricity
     def write_bignum_guts(num)
       write_1 (num >= 0 ? 0 : 1)
       num = num.abs
-      i = 0
-      while (rem = (num >> i * 8) % (256)) != 0
+      while num != 0
+        rem = num % 256
         write_1 rem
-        i += 1
+        num = num >> 8
       end
     end
 

data/test/decode_spec.rb

@@ -127,6 +127,11 @@ context "When unpacking from a binary stream" do
     get("f").should == :f
   end
 
+  specify "massive binaries should not overflow the stack" do
+    bin = [131,109,0,128,0,0].pack('c*') + ('a' * (8 * 1024 * 1024))
+    assert_equal (8 * 1024 * 1024), Erlectricity::Decoder.decode(bin).size
+  end
+
   specify "a good thing should be awesome" do
     get(%Q-[{options,{struct,[{test,<<"I'm chargin' mah lazer">>}]}},{passage,<<"Why doesn't this work?">>}]-).should ==
     [[:options, [:struct, [[:test, "I'm chargin' mah lazer"]]]], [:passage, "Why doesn't this work?"]]

data/test/encode_spec.rb

@@ -36,6 +36,7 @@ context "When packing to a binary stream" do
     write_any(-(1 << 27)).should == get_erl_with_magic("#{-(1 << 27)}")
 
     # #SMALL_BIGNUMS
+    get{@encoder.write_fixnum(10_000_000_000_000_000_000)}.should == get_erl("10000000000000000000")
     get{@encoder.write_fixnum(1254976067)}.should == get_erl("1254976067")
     get{@encoder.write_fixnum(-1254976067)}.should == get_erl("-1254976067")
     # get{@encoder.write_fixnum((1 << word_length))}.should == get_erl("#{(1 << word_length)}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: erlectricity
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Scott Fleckenstein
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-08 00:00:00 -07:00
+date: 2009-10-28 00:00:00 -07:00
 default_executable: 
 dependencies: []