fix null byte causing premature termination of strings on decode

mojombo · May 4, 2009 · 81a6709 · 81a6709
1 parent ca9a482
commit 81a6709
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ ext/decoder.bundle
 ext/decoder.o
 *.beam
 *.dump
+.DS_Store
diff --git a/History.txt b/History.txt
@@ -1,4 +1,8 @@
-==
+== 1.0.1 / 2009-05-03
+  * Bug Fixes
+    * Fix premature null byte termination on binary decode
+
+== 1.0.0 / 2009-04-29
   * Backward Incompatible Changes
     * Implicit array call for f.when(:echo, String) must now be called as
       f.when([:echo, String]) to eliminate ambiguity

diff --git a/ext/decoder.c b/ext/decoder.c
@@ -146,7 +146,7 @@ VALUE read_bin(unsigned char **pData) {
   unsigned char buf[length + 1];
   read_string_raw(buf, pData, length);
 
-  return rb_str_new2((char *) buf);
+  return rb_str_new((char *) buf, length);
 }
 
 VALUE read_string(unsigned char **pData) {

diff --git a/test/decode_spec.rb b/test/decode_spec.rb
@@ -107,6 +107,7 @@
   specify "an erlang binary should decode to a string" do
     get("<< 3,4,255 >>").should == "\003\004\377"
     get("<< \"whatup\" >>").should == "whatup"
+    get("<< 99,0,99 >>").should == "c\000c"
   end
 
   specify "erlang atomic booleans should decode to ruby booleans" do

diff --git a/test/encode_spec.rb b/test/encode_spec.rb
@@ -112,6 +112,7 @@
   specify "a string should be encoded as a erlang binary would be" do
     get{@encoder.write_binary "hey who"}.should == get_erl("<< \"hey who\" >>")
     get{@encoder.write_binary ""}.should == get_erl("<< \"\" >>")
+    get{@encoder.write_binary "c\000c"}.should == get_erl("<< 99,0,99 >>")
 
     write_any("hey who").should == get_erl_with_magic("<< \"hey who\" >>")
     write_any("").should == get_erl_with_magic("<< \"\" >>")