oj 3.16.11 → 3.17.6

data/ext/oj/object.c

@@ -31,7 +31,7 @@ inline static long read_long(const char *str, size_t len) {
 static VALUE calc_hash_key(ParseInfo pi, Val kval, char k1) {
     volatile VALUE rkey;
 
-    if (':' == k1) {
+    if (':' == k1 && 0 < kval->klen) {
         return ID2SYM(rb_intern3(kval->key + 1, kval->klen - 1, oj_utf8_encoding));
     }
     if (Yes == pi->options.sym_key) {
@@ -54,7 +54,7 @@ static VALUE str_to_value(ParseInfo pi, const char *str, size_t len, const char
     } else if (pi->circ_array && 3 <= len && '^' == *orig && 'r' == orig[1]) {
         long i = read_long(str + 2, len - 2);
 
-        if (0 > i) {
+        if (0 >= i) {
             oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a valid ID number");
             return Qnil;
         }
@@ -207,7 +207,7 @@ oj_parse_xml_time(const char *str, int len) {
 
 static int hat_cstr(ParseInfo pi, Val parent, Val kval, const char *str, size_t len) {
     const char *key  = kval->key;
-    int         klen = kval->klen;
+    size_t      klen = kval->klen;
 
     if (2 == klen) {
         switch (key[1]) {
@@ -230,7 +230,12 @@ static int hat_cstr(ParseInfo pi, Val parent, Val kval, const char *str, size_t
             parent->odd_args = oj_odd_alloc_args(odd);
             break;
         }
-        case 'm': parent->val = ID2SYM(rb_intern3(str + 1, len - 1, oj_utf8_encoding)); break;
+        case 'm':
+            if (0 == len) {
+                return 0;
+            }
+            parent->val = ID2SYM(rb_intern3(str + 1, len - 1, oj_utf8_encoding));
+            break;
         case 's': parent->val = rb_utf8_str_new(str, len); break;
         case 'c':  // class
         {
@@ -319,20 +324,26 @@ static int hat_value(ParseInfo pi, Val parent, const char *key, size_t klen, vol
             e1 = *RARRAY_CONST_PTR(value);
             // check for anonymous Struct
             if (T_ARRAY == rb_type(e1)) {
-                VALUE          args[1024];
-                volatile VALUE rstr;
+                // Build the member-name list in a GC-managed Ruby array. Using a
+                // fixed C buffer (VALUE args[1024]) here overflowed the stack when
+                // the JSON supplied more than 1024 member names.
+                volatile VALUE names = rb_ary_new2(RARRAY_LEN(e1));
                 size_t         i;
                 size_t         cnt = RARRAY_LEN(e1);
 
                 for (i = 0; i < cnt; i++) {
-                    rstr    = RARRAY_AREF(e1, i);
-                    args[i] = rb_funcall(rstr, oj_to_sym_id, 0);
+                    rb_ary_push(names, rb_funcall(RARRAY_AREF(e1, i), oj_to_sym_id, 0));
                 }
-                sc = rb_funcall2(rb_cStruct, oj_new_id, (int)cnt, args);
+                sc = rb_apply(rb_cStruct, oj_new_id, names);
             } else {
                 // If struct is not defined then we let this fail and raise an exception.
                 sc = oj_name2struct(pi, *RARRAY_CONST_PTR(value), rb_eArgError);
             }
+            if (Qundef == sc || Qnil == sc) {
+                // oj_name2struct already recorded the error; do not pass an
+                // unresolved (Qundef) class on to rb_obj_alloc/rb_class_new_instance.
+                return 1;
+            }
             if (sc == rb_cRange) {
                 parent->val = rb_class_new_instance((int)(len - 1), RARRAY_CONST_PTR(value) + 1, rb_cRange);
             } else {
@@ -389,7 +400,7 @@ void oj_set_obj_ivar(Val parent, Val kval, VALUE value) {
 
 static void hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, const char *orig) {
     const char    *key    = kval->key;
-    int            klen   = kval->klen;
+    size_t         klen   = kval->klen;
     Val            parent = stack_peek(&pi->stack);
     volatile VALUE rval   = Qnil;
 
@@ -431,7 +442,7 @@ WHICH_TYPE:
             if (0 != oj_odd_set_arg(parent->odd_args, kval->key, kval->klen, rval)) {
                 char buf[256];
 
-                if ((int)sizeof(buf) - 1 <= klen) {
+                if (sizeof(buf) - 1 <= klen) {
                     klen = sizeof(buf) - 2;
                 }
                 memcpy(buf, key, klen);
@@ -460,7 +471,7 @@ WHICH_TYPE:
 
 static void hash_set_num(ParseInfo pi, Val kval, NumInfo ni) {
     const char    *key    = kval->key;
-    int            klen   = kval->klen;
+    size_t         klen   = kval->klen;
     Val            parent = stack_peek(&pi->stack);
     volatile VALUE rval   = Qnil;
 
@@ -500,7 +511,7 @@ WHICH_TYPE:
             if (0 != oj_odd_set_arg(parent->odd_args, key, klen, rval)) {
                 char buf[256];
 
-                if ((int)sizeof(buf) - 1 <= klen) {
+                if (sizeof(buf) - 1 <= klen) {
                     klen = sizeof(buf) - 2;
                 }
                 memcpy(buf, key, klen);
@@ -529,7 +540,7 @@ WHICH_TYPE:
 
 static void hash_set_value(ParseInfo pi, Val kval, VALUE value) {
     const char *key    = kval->key;
-    int         klen   = kval->klen;
+    size_t      klen   = kval->klen;
     Val         parent = stack_peek(&pi->stack);
 
 WHICH_TYPE:
@@ -585,7 +596,7 @@ WHICH_TYPE:
         } else if (0 != oj_odd_set_arg(parent->odd_args, key, klen, value)) {
             char buf[256];
 
-            if ((int)sizeof(buf) - 1 <= klen) {
+            if (sizeof(buf) - 1 <= klen) {
                 klen = sizeof(buf) - 2;
             }
             memcpy(buf, key, klen);

data/ext/oj/odd.c

@@ -166,7 +166,11 @@ Odd oj_get_oddc(const char *classname, size_t len) {
         if (len == odd->clen && 0 == strncmp(classname, odd->classname, len)) {
             return odd;
         }
-        if (odd->is_module && 0 == strncmp(odd->classname, classname, odd->clen) && ':' == classname[odd->clen]) {
+        // The module test needs a "::" after the module name, so the name has
+        // to be shorter than what it is compared against. Without that the
+        // comparison and the character after it both run past len.
+        if (odd->is_module && odd->clen < len && 0 == strncmp(odd->classname, classname, odd->clen) &&
+            ':' == classname[odd->clen]) {
             return odd;
         }
     }
@@ -195,7 +199,7 @@ int oj_odd_set_arg(OddArgs args, const char *key, size_t klen, VALUE value) {
     int          i;
 
     for (i = args->odd->attr_cnt, np = args->odd->attr_names, vp = args->args; 0 < i; i--, np++, vp++) {
-        if (0 == strncmp(key, *np, klen) && '\0' == *((*np) + klen)) {
+        if (klen == strlen(*np) && 0 == memcmp(key, *np, klen)) {
             *vp = value;
             return 0;
         }