fix another segv

brianmario · Dec 12, 2017 · a5c4030 · a5c4030
1 parent db10c28
commit a5c4030
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/ext/yajl/yajl_ext.c b/ext/yajl/yajl_ext.c
@@ -220,13 +220,13 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
                 str = rb_funcall(obj, intern_to_json, 0);
                 Check_Type(str, T_STRING);
                 cptr = RSTRING_PTR(str);
-		len = (unsigned int)RSTRING_LEN(str);
+                len = (unsigned int)RSTRING_LEN(str);
                 CHECK_STATUS(yajl_gen_number(w->encoder, cptr, len));
             } else {
                 str = rb_funcall(obj, intern_to_s, 0);
                 Check_Type(str, T_STRING);
                 cptr = RSTRING_PTR(str);
-		len = (unsigned int)RSTRING_LEN(str);
+                len = (unsigned int)RSTRING_LEN(str);
                 CHECK_STATUS(yajl_gen_string(w->encoder, (const unsigned char *)cptr, len));
             }
             break;
@@ -861,6 +861,9 @@ static VALUE rb_yajl_projector_build_simple_value(yajl_event_stream_t parser, ya
         case yajl_tok_comma:
             rb_raise(cParseError, "unexpected comma while constructing value");
 
+        case yajl_tok_colon:
+            rb_raise(cParseError, "unexpected colon while constructing value");
+
         default:;
             assert(0);
     }

diff --git a/spec/projection/projection.rb b/spec/projection/projection.rb
@@ -34,6 +34,14 @@
     }.to raise_error(Yajl::ParseError)
   end
 
+  it "should raise an exception and not segv on colons" do
+    stream = StringIO.new('[::::]')
+    projector = Yajl::Projector.new(stream)
+    expect {
+      projector.project({"name" => nil})
+    }.to raise_error(Yajl::ParseError)
+  end
+
   def project(schema, over: "", json: nil, stream: nil)
     if stream.nil?
       if json.nil?