oj 3.13.9 → 3.13.12

data/ext/oj/intern.h

@@ -9,7 +9,7 @@
 
 struct _parseInfo;
 
-extern void oj_hash_init();
+extern void oj_hash_init(void);
 
 extern VALUE oj_str_intern(const char *key, size_t len);
 extern VALUE oj_sym_intern(const char *key, size_t len);

data/ext/oj/mimic_json.c

@@ -198,7 +198,6 @@ static int mimic_limit_arg(VALUE a) {
  * Returns [_String_] a JSON string.
  */
 static VALUE mimic_dump(int argc, VALUE *argv, VALUE self) {
-    char            buf[4096];
     struct _out     out;
     struct _options copts = oj_default_options;
     VALUE           rstr;
@@ -206,9 +205,9 @@ static VALUE mimic_dump(int argc, VALUE *argv, VALUE self) {
 
     copts.str_rx.head = NULL;
     copts.str_rx.tail = NULL;
-    out.buf           = buf;
-    out.end           = buf + sizeof(buf) - 10;
-    out.allocated     = false;
+
+    oj_out_init(&out);
+
     out.caller        = CALLER_DUMP;
     copts.escape_mode = JXEsc;
     copts.mode        = CompatMode;
@@ -257,9 +256,9 @@ static VALUE mimic_dump(int argc, VALUE *argv, VALUE self) {
         rb_funcall2(io, oj_write_id, 1, args);
         rstr = io;
     }
-    if (out.allocated) {
-        xfree(out.buf);
-    }
+
+    oj_out_free(&out);
+
     return rstr;
 }
 
@@ -272,7 +271,7 @@ static int mimic_walk(VALUE key, VALUE obj, VALUE proc) {
         size_t i;
 
         for (i = 0; i < cnt; i++) {
-            mimic_walk(Qnil, rb_ary_entry(obj, i), proc);
+            mimic_walk(Qnil, RARRAY_AREF(obj, i), proc);
         }
         break;
     }
@@ -358,15 +357,16 @@ static VALUE mimic_dump_load(int argc, VALUE *argv, VALUE self) {
 }
 
 static VALUE mimic_generate_core(int argc, VALUE *argv, Options copts) {
-    char        buf[4096];
     struct _out out;
     VALUE       rstr;
 
-    memset(buf, 0, sizeof(buf));
+    if (0 == argc) {
+        rb_raise(rb_eArgError, "wrong number of arguments (0))");
+    }
+    memset(out.stack_buffer, 0, sizeof(out.stack_buffer));
+
+    oj_out_init(&out);
 
-    out.buf       = buf;
-    out.end       = buf + sizeof(buf) - 10;
-    out.allocated = false;
     out.omit_nil  = copts->dump_opts.omit_nil;
     out.caller    = CALLER_GENERATE;
     // For obj.to_json or generate nan is not allowed but if called from dump
@@ -398,9 +398,9 @@ static VALUE mimic_generate_core(int argc, VALUE *argv, Options copts) {
     }
     rstr = rb_str_new2(out.buf);
     rstr = oj_encode(rstr);
-    if (out.allocated) {
-        xfree(out.buf);
-    }
+
+    oj_out_free(&out);
+
     return rstr;
 }
 
@@ -457,9 +457,12 @@ oj_mimic_pretty_generate(int argc, VALUE *argv, VALUE self) {
     // a Hash. I haven't dug deep enough to find out why but using a State
     // instance and not a Hash gives the desired behavior.
     *rargs = *argv;
+    if (0 == argc) {
+        rb_raise(rb_eArgError, "wrong number of arguments (0))");
+    }
     if (1 == argc) {
         h = rb_hash_new();
-    } else {
+    } else  {
         h = argv[1];
     }
     if (!oj_hash_has_key(h, oj_indent_sym)) {
@@ -499,6 +502,52 @@ oj_mimic_pretty_generate(int argc, VALUE *argv, VALUE self) {
     return mimic_generate_core(2, rargs, &copts);
 }
 
+static int parse_options_cb(VALUE k, VALUE v, VALUE info) {
+    struct _parseInfo *pi = (struct _parseInfo *)info;
+
+    if (oj_symbolize_names_sym == k) {
+        pi->options.sym_key = (Qtrue == v) ? Yes : No;
+    } else if (oj_quirks_mode_sym == k) {
+        pi->options.quirks_mode = (Qtrue == v) ? Yes : No;
+    } else if (oj_create_additions_sym == k) {
+        pi->options.create_ok = (Qtrue == v) ? Yes : No;
+    } else if (oj_allow_nan_sym == k) {
+        pi->options.allow_nan = (Qtrue == v) ? Yes : No;
+    } else if (oj_hash_class_sym == k) {
+        if (Qnil == v) {
+            pi->options.hash_class = Qnil;
+        } else {
+            rb_check_type(v, T_CLASS);
+            pi->options.hash_class = v;
+        }
+    } else if (oj_object_class_sym == k) {
+        if (Qnil == v) {
+            pi->options.hash_class = Qnil;
+        } else {
+            rb_check_type(v, T_CLASS);
+            pi->options.hash_class = v;
+        }
+    } else if (oj_array_class_sym == k) {
+        if (Qnil == v) {
+            pi->options.array_class = Qnil;
+        } else {
+            rb_check_type(v, T_CLASS);
+            pi->options.array_class = v;
+        }
+    } else if (oj_decimal_class_sym == k) {
+        pi->options.compat_bigdec = (oj_bigdecimal_class == v);
+    } else if (oj_max_nesting_sym == k) {
+        if (Qtrue == v) {
+            pi->max_depth = 100;
+        } else if (Qfalse == v || Qnil == v) {
+            pi->max_depth = 0;
+        } else if (T_FIXNUM == rb_type(v)) {
+            pi->max_depth = NUM2INT(v);
+        }
+    }
+    return ST_CONTINUE;
+}
+
 static VALUE mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
     struct _parseInfo pi;
     VALUE             ropts;
@@ -524,59 +573,11 @@ static VALUE mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
     pi.max_depth             = 100;
 
     if (Qnil != ropts) {
-        VALUE v;
-
         if (T_HASH != rb_type(ropts)) {
             rb_raise(rb_eArgError, "options must be a hash.");
         }
-        if (Qnil != (v = rb_hash_lookup(ropts, oj_symbolize_names_sym))) {
-            pi.options.sym_key = (Qtrue == v) ? Yes : No;
-        }
-        if (Qnil != (v = rb_hash_lookup(ropts, oj_quirks_mode_sym))) {
-            pi.options.quirks_mode = (Qtrue == v) ? Yes : No;
-        }
-        if (Qnil != (v = rb_hash_lookup(ropts, oj_create_additions_sym))) {
-            pi.options.create_ok = (Qtrue == v) ? Yes : No;
-        }
-        if (Qnil != (v = rb_hash_lookup(ropts, oj_allow_nan_sym))) {
-            pi.options.allow_nan = (Qtrue == v) ? Yes : No;
-        }
 
-        if (oj_hash_has_key(ropts, oj_hash_class_sym)) {
-            if (Qnil == (v = rb_hash_lookup(ropts, oj_hash_class_sym))) {
-                pi.options.hash_class = Qnil;
-            } else {
-                rb_check_type(v, T_CLASS);
-                pi.options.hash_class = v;
-            }
-        }
-        if (oj_hash_has_key(ropts, oj_object_class_sym)) {
-            if (Qnil == (v = rb_hash_lookup(ropts, oj_object_class_sym))) {
-                pi.options.hash_class = Qnil;
-            } else {
-                rb_check_type(v, T_CLASS);
-                pi.options.hash_class = v;
-            }
-        }
-        if (oj_hash_has_key(ropts, oj_array_class_sym)) {
-            if (Qnil == (v = rb_hash_lookup(ropts, oj_array_class_sym))) {
-                pi.options.array_class = Qnil;
-            } else {
-                rb_check_type(v, T_CLASS);
-                pi.options.array_class = v;
-            }
-        }
-        if (oj_hash_has_key(ropts, oj_decimal_class_sym)) {
-            pi.options.compat_bigdec = (oj_bigdecimal_class == rb_hash_lookup(ropts, oj_decimal_class_sym));
-        }
-        v = rb_hash_lookup(ropts, oj_max_nesting_sym);
-        if (Qtrue == v) {
-            pi.max_depth = 100;
-        } else if (Qfalse == v || Qnil == v) {
-            pi.max_depth = 0;
-        } else if (T_FIXNUM == rb_type(v)) {
-            pi.max_depth = NUM2INT(v);
-        }
+        rb_hash_foreach(ropts, parse_options_cb, (VALUE)&pi);
         oj_parse_opt_match_string(&pi.options.str_rx, ropts);
         if (Yes == pi.options.create_ok && Yes == pi.options.sym_key) {
             rb_raise(rb_eArgError, ":symbolize_names and :create_additions can not both be true.");
@@ -742,16 +743,15 @@ static struct _options mimic_object_to_json_options = {0,              // indent
                                                        }};
 
 static VALUE mimic_object_to_json(int argc, VALUE *argv, VALUE self) {
-    char            buf[4096];
     struct _out     out;
     VALUE           rstr;
     struct _options copts = oj_default_options;
 
     copts.str_rx.head = NULL;
     copts.str_rx.tail = NULL;
-    out.buf           = buf;
-    out.end           = buf + sizeof(buf) - 10;
-    out.allocated     = false;
+
+    oj_out_init(&out);
+
     out.omit_nil      = copts.dump_opts.omit_nil;
     copts.mode        = CompatMode;
     copts.to_json     = No;
@@ -767,9 +767,9 @@ static VALUE mimic_object_to_json(int argc, VALUE *argv, VALUE self) {
     }
     rstr = rb_str_new2(out.buf);
     rstr = oj_encode(rstr);
-    if (out.allocated) {
-        xfree(out.buf);
-    }
+
+    oj_out_free(&out);
+
     return rstr;
 }
 

data/ext/oj/object.c

@@ -325,7 +325,7 @@ static int hat_value(ParseInfo pi, Val parent, const char *key, size_t klen, vol
                 int            i, cnt = (int)RARRAY_LEN(e1);
 
                 for (i = 0; i < cnt; i++) {
-                    rstr    = rb_ary_entry(e1, i);
+                    rstr    = RARRAY_AREF(e1, i);
                     args[i] = rb_funcall(rstr, oj_to_sym_id, 0);
                 }
                 sc = rb_funcall2(rb_cStruct, oj_new_id, cnt, args);

data/ext/oj/odd.c

@@ -5,28 +5,27 @@
 
 #include <string.h>
 
-static struct _odd  _odds[4];  // bump up if new initial Odd classes are added
-static struct _odd *odds    = _odds;
-static long         odd_cnt = 0;
-static ID           sec_id;
-static ID           sec_fraction_id;
-static ID           to_f_id;
-static ID           numerator_id;
-static ID           denominator_id;
-static ID           rational_id;
-static VALUE        rational_class;
+static Odd odds = NULL;
+static ID  sec_id;
+static ID  sec_fraction_id;
+static ID  to_f_id;
+static ID  numerator_id;
+static ID  denominator_id;
+static ID  rational_id;
 
 static void set_class(Odd odd, const char *classname) {
     const char **np;
-    ID *         idp;
+    ID          *idp;
 
-    odd->classname  = classname;
-    odd->clen       = strlen(classname);
-    odd->clas       = rb_const_get(rb_cObject, rb_intern(classname));
+    odd->classname = classname;
+    odd->clen      = strlen(classname);
+    odd->clas      = rb_const_get(rb_cObject, rb_intern(classname));
+    rb_gc_register_mark_object(odd->clas);
     odd->create_obj = odd->clas;
-    odd->create_op  = rb_intern("new");
-    odd->is_module  = (T_MODULE == rb_type(odd->clas));
-    odd->raw        = 0;
+    rb_gc_register_mark_object(odd->create_obj);
+    odd->create_op = rb_intern("new");
+    odd->is_module = (T_MODULE == rb_type(odd->clas));
+    odd->raw       = 0;
     for (np = odd->attr_names, idp = odd->attrs; 0 != *np; np++, idp++) {
         *idp = rb_intern(*np);
     }
@@ -37,15 +36,48 @@ static VALUE get_datetime_secs(VALUE obj) {
     volatile VALUE rsecs = rb_funcall(obj, sec_id, 0);
     volatile VALUE rfrac = rb_funcall(obj, sec_fraction_id, 0);
     long           sec   = NUM2LONG(rsecs);
-    long long      num   = rb_num2ll(rb_funcall(rfrac, numerator_id, 0));
-    long long      den   = rb_num2ll(rb_funcall(rfrac, denominator_id, 0));
+    long long      num   = NUM2LL(rb_funcall(rfrac, numerator_id, 0));
+    long long      den   = NUM2LL(rb_funcall(rfrac, denominator_id, 0));
 
     num += sec * den;
 
     return rb_funcall(rb_cObject, rational_id, 2, rb_ll2inum(num), rb_ll2inum(den));
 }
 
-void oj_odd_init() {
+static void print_odd(Odd odd) {
+    const char **np;
+    int          i;
+
+    printf("  %s {\n", odd->classname);
+    printf("    attr_cnt: %d %p\n", odd->attr_cnt, (void *)odd->attr_names);
+    printf("    attr_names: %p\n", (void *)*odd->attr_names);
+    printf("    attr_names: %c\n", **odd->attr_names);
+    for (i = odd->attr_cnt, np = odd->attr_names; 0 < i; i--, np++) {
+        printf("    %d %s\n", i, *np);
+    }
+    printf("  }\n");
+}
+
+void print_all_odds(const char *label) {
+    Odd odd;
+    printf("@ %s {\n", label);
+    for (odd = odds; NULL != odd; odd = odd->next) {
+        print_odd(odd);
+    }
+    printf("}\n");
+}
+
+static Odd odd_create(void) {
+    Odd odd = ALLOC(struct _odd);
+
+    memset(odd, 0, sizeof(struct _odd));
+    odd->next = odds;
+    odds      = odd;
+
+    return odd;
+}
+
+void oj_odd_init(void) {
     Odd          odd;
     const char **np;
 
@@ -55,11 +87,9 @@ void oj_odd_init() {
     numerator_id    = rb_intern("numerator");
     denominator_id  = rb_intern("denominator");
     rational_id     = rb_intern("Rational");
-    rational_class  = rb_const_get(rb_cObject, rational_id);
 
-    memset(_odds, 0, sizeof(_odds));
-    odd = odds;
     // Rational
+    odd   = odd_create();
     np    = odd->attr_names;
     *np++ = "numerator";
     *np++ = "denominator";
@@ -68,8 +98,9 @@ void oj_odd_init() {
     odd->create_obj = rb_cObject;
     odd->create_op  = rational_id;
     odd->attr_cnt   = 2;
+
     // Date
-    odd++;
+    odd   = odd_create();
     np    = odd->attr_names;
     *np++ = "year";
     *np++ = "month";
@@ -78,8 +109,9 @@ void oj_odd_init() {
     *np++ = 0;
     set_class(odd, "Date");
     odd->attr_cnt = 4;
+
     // DateTime
-    odd++;
+    odd   = odd_create();
     np    = odd->attr_names;
     *np++ = "year";
     *np++ = "month";
@@ -93,8 +125,9 @@ void oj_odd_init() {
     set_class(odd, "DateTime");
     odd->attr_cnt     = 8;
     odd->attrFuncs[5] = get_datetime_secs;
+
     // Range
-    odd++;
+    odd   = odd_create();
     np    = odd->attr_names;
     *np++ = "begin";
     *np++ = "end";
@@ -102,15 +135,13 @@ void oj_odd_init() {
     *np++ = 0;
     set_class(odd, "Range");
     odd->attr_cnt = 3;
-
-    odd_cnt = odd - odds + 1;
 }
 
 Odd oj_get_odd(VALUE clas) {
     Odd         odd;
     const char *classname = NULL;
 
-    for (odd = odds + odd_cnt - 1; odds <= odd; odd--) {
+    for (odd = odds; NULL != odd; odd = odd->next) {
         if (clas == odd->clas) {
             return odd;
         }
@@ -129,21 +160,20 @@ Odd oj_get_odd(VALUE clas) {
 Odd oj_get_oddc(const char *classname, size_t len) {
     Odd odd;
 
-    for (odd = odds + odd_cnt - 1; odds <= odd; odd--) {
+    for (odd = odds; NULL != odd; odd = odd->next) {
         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]) {
+        if (odd->is_module && 0 == strncmp(odd->classname, classname, odd->clen) && ':' == classname[odd->clen]) {
             return odd;
         }
     }
-    return 0;
+    return NULL;
 }
 
 OddArgs oj_odd_alloc_args(Odd odd) {
     OddArgs oa = ALLOC_N(struct _oddArgs, 1);
-    VALUE * a;
+    VALUE  *a;
     int     i;
 
     oa->odd = odd;
@@ -159,11 +189,10 @@ void oj_odd_free(OddArgs args) {
 
 int oj_odd_set_arg(OddArgs args, const char *key, size_t klen, VALUE value) {
     const char **np;
-    VALUE *      vp;
+    VALUE       *vp;
     int          i;
 
-    for (i = args->odd->attr_cnt, np = args->odd->attr_names, vp = args->args; 0 < i;
-         i--, np++, vp++) {
+    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)) {
             *vp = value;
             return 0;
@@ -172,37 +201,26 @@ int oj_odd_set_arg(OddArgs args, const char *key, size_t klen, VALUE value) {
     return -1;
 }
 
-void oj_reg_odd(VALUE  clas,
-                VALUE  create_object,
-                VALUE  create_method,
-                int    mcnt,
-                VALUE *members,
-                bool   raw) {
+void oj_reg_odd(VALUE clas, VALUE create_object, VALUE create_method, int mcnt, VALUE *members, bool raw) {
     Odd          odd;
     const char **np;
-    ID *         ap;
+    ID          *ap;
     AttrGetFunc *fp;
 
-    if (_odds == odds) {
-        odds = ALLOC_N(struct _odd, odd_cnt + 1);
-
-        memcpy(odds, _odds, sizeof(struct _odd) * odd_cnt);
-    } else {
-        REALLOC_N(odds, struct _odd, odd_cnt + 1);
-    }
-    odd       = odds + odd_cnt;
+    odd       = odd_create();
     odd->clas = clas;
+    rb_gc_register_mark_object(odd->clas);
     if (NULL == (odd->classname = strdup(rb_class2name(clas)))) {
-        rb_raise(rb_eNoMemError, "for attribute name.");
+        rb_raise(rb_eNoMemError, "for class name.");
     }
     odd->clen       = strlen(odd->classname);
     odd->create_obj = create_object;
-    odd->create_op  = SYM2ID(create_method);
-    odd->attr_cnt   = mcnt;
-    odd->is_module  = (T_MODULE == rb_type(clas));
-    odd->raw        = raw;
-    for (ap = odd->attrs, np = odd->attr_names, fp = odd->attrFuncs; 0 < mcnt;
-         mcnt--, ap++, np++, members++, fp++) {
+    rb_gc_register_mark_object(odd->create_obj);
+    odd->create_op = SYM2ID(create_method);
+    odd->attr_cnt  = mcnt;
+    odd->is_module = (T_MODULE == rb_type(clas));
+    odd->raw       = raw;
+    for (ap = odd->attrs, np = odd->attr_names, fp = odd->attrFuncs; 0 < mcnt; mcnt--, ap++, np++, members++, fp++) {
         *fp = 0;
         switch (rb_type(*members)) {
         case T_STRING:
@@ -210,14 +228,16 @@ void oj_reg_odd(VALUE  clas,
                 rb_raise(rb_eNoMemError, "for attribute name.");
             }
             break;
-        case T_SYMBOL: *np = rb_id2name(SYM2ID(*members)); break;
-        default:
-            rb_raise(rb_eArgError, "registered member identifiers must be Strings or Symbols.");
+        case T_SYMBOL:
+            // The symbol can move and invalidate the name so make a copy.
+            if (NULL == (*np = strdup(rb_id2name(SYM2ID(*members))))) {
+                rb_raise(rb_eNoMemError, "for attribute name.");
+            }
             break;
+        default: rb_raise(rb_eArgError, "registered member identifiers must be Strings or Symbols."); break;
         }
         *ap = rb_intern(*np);
     }
     *np = 0;
     *ap = 0;
-    odd_cnt++;
 }

data/ext/oj/odd.h

@@ -13,17 +13,18 @@
 typedef VALUE (*AttrGetFunc)(VALUE obj);
 
 typedef struct _odd {
-    const char *classname;
-    size_t      clen;
-    VALUE       clas;  // Ruby class or module
-    VALUE       create_obj;
-    ID          create_op;
-    int         attr_cnt;
-    bool        is_module;
-    bool        raw;
-    const char *attr_names[MAX_ODD_ARGS];  // NULL terminated attr names
-    ID          attrs[MAX_ODD_ARGS];       // 0 terminated attr IDs
-    AttrGetFunc attrFuncs[MAX_ODD_ARGS];
+    struct _odd *next;
+    const char * classname;
+    size_t       clen;
+    VALUE        clas;  // Ruby class or module
+    VALUE        create_obj;
+    ID           create_op;
+    int          attr_cnt;
+    bool         is_module;
+    bool         raw;
+    const char * attr_names[MAX_ODD_ARGS];  // NULL terminated attr names
+    ID           attrs[MAX_ODD_ARGS];       // 0 terminated attr IDs
+    AttrGetFunc  attrFuncs[MAX_ODD_ARGS];
 } * Odd;
 
 typedef struct _oddArgs {
@@ -37,7 +38,6 @@ extern Odd     oj_get_oddc(const char *classname, size_t len);
 extern OddArgs oj_odd_alloc_args(Odd odd);
 extern void    oj_odd_free(OddArgs args);
 extern int     oj_odd_set_arg(OddArgs args, const char *key, size_t klen, VALUE value);
-extern void
-oj_reg_odd(VALUE clas, VALUE create_object, VALUE create_method, int mcnt, VALUE *members, bool raw);
+extern void    oj_reg_odd(VALUE clas, VALUE create_object, VALUE create_method, int mcnt, VALUE *members, bool raw);
 
 #endif /* OJ_ODD_H */

data/ext/oj/oj.c

@@ -153,6 +153,7 @@ static VALUE xmlschema_sym;
 static VALUE xss_safe_sym;
 
 rb_encoding *oj_utf8_encoding = 0;
+int oj_utf8_encoding_index = 0;
 
 #ifdef HAVE_PTHREAD_MUTEX_INIT
 pthread_mutex_t oj_cache_mutex;
@@ -916,7 +917,7 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
 
                 copts->ignore = ALLOC_N(VALUE, cnt + 1);
                 for (i = 0; i < cnt; i++) {
-                    copts->ignore[i] = rb_ary_entry(v, i);
+                    copts->ignore[i] = RARRAY_AREF(v, i);
                 }
                 copts->ignore[i] = Qnil;
             }
@@ -1243,9 +1244,8 @@ static VALUE dump_body(VALUE a) {
 static VALUE dump_ensure(VALUE a) {
     volatile struct dump_arg *arg = (void *)a;
 
-    if (arg->out->allocated) {
-        xfree(arg->out->buf);
-    }
+    oj_out_free(arg->out);
+
     return Qnil;
 }
 
@@ -1257,7 +1257,6 @@ static VALUE dump_ensure(VALUE a) {
  * - *options* [_Hash_] same as default_options
  */
 static VALUE dump(int argc, VALUE *argv, VALUE self) {
-    char            buf[4096];
     struct dump_arg arg;
     struct _out     out;
     struct _options copts = oj_default_options;
@@ -1279,9 +1278,8 @@ static VALUE dump(int argc, VALUE *argv, VALUE self) {
     arg.argc  = argc;
     arg.argv  = argv;
 
-    arg.out->buf       = buf;
-    arg.out->end       = buf + sizeof(buf) - 10;
-    arg.out->allocated = false;
+    oj_out_init(arg.out);
+
     arg.out->omit_nil  = copts.dump_opts.omit_nil;
     arg.out->caller    = CALLER_DUMP;
 
@@ -1313,7 +1311,6 @@ static VALUE dump(int argc, VALUE *argv, VALUE self) {
  * Returns [_String_] the encoded JSON.
  */
 static VALUE to_json(int argc, VALUE *argv, VALUE self) {
-    char            buf[4096];
     struct _out     out;
     struct _options copts = oj_default_options;
     VALUE           rstr;
@@ -1328,9 +1325,9 @@ static VALUE to_json(int argc, VALUE *argv, VALUE self) {
     }
     copts.mode    = CompatMode;
     copts.to_json = Yes;
-    out.buf       = buf;
-    out.end       = buf + sizeof(buf) - 10;
-    out.allocated = false;
+
+    oj_out_init(&out);
+
     out.omit_nil  = copts.dump_opts.omit_nil;
     // For obj.to_json or generate nan is not allowed but if called from dump
     // it is.
@@ -1341,9 +1338,9 @@ static VALUE to_json(int argc, VALUE *argv, VALUE self) {
     }
     rstr = rb_str_new2(out.buf);
     rstr = oj_encode(rstr);
-    if (out.allocated) {
-        xfree(out.buf);
-    }
+
+    oj_out_free(&out);
+
     return rstr;
 }
 
@@ -1703,6 +1700,15 @@ static VALUE protect_require(VALUE x) {
     return Qnil;
 }
 
+extern void print_all_odds(const char *label);
+
+static VALUE
+debug_odd(VALUE self, VALUE label) {
+    print_all_odds(RSTRING_PTR(label));
+    return Qnil;
+}
+
+
 /* Document-module: Oj
  *
  * Optimized JSON (Oj), as the name implies was written to provide speed
@@ -1731,15 +1737,19 @@ static VALUE protect_require(VALUE x) {
  *
  * - *:wab* specifically for WAB data exchange.
  */
-void Init_oj() {
+void Init_oj(void) {
     int err = 0;
 
 #if HAVE_RB_EXT_RACTOR_SAFE
     rb_ext_ractor_safe(true);
 #endif
     Oj = rb_define_module("Oj");
+    rb_gc_register_address(&Oj);
 
     oj_cstack_class = rb_define_class_under(Oj, "CStack", rb_cObject);
+    rb_gc_register_address(&oj_cstack_class);
+
+    rb_undef_alloc_func(oj_cstack_class);
 
     oj_string_writer_init();
     oj_stream_writer_init();
@@ -1748,9 +1758,11 @@ void Init_oj() {
     // On Rubinius the require fails but can be done from a ruby file.
     rb_protect(protect_require, Qnil, &err);
     rb_require("stringio");
-    oj_utf8_encoding = rb_enc_find("UTF-8");
+    oj_utf8_encoding_index = rb_enc_find_index("UTF-8");
+    oj_utf8_encoding = rb_enc_from_index(oj_utf8_encoding_index);
 
     // rb_define_module_function(Oj, "hash_test", hash_test, 0);
+    rb_define_module_function(Oj, "debug_odd", debug_odd, 1);
 
     rb_define_module_function(Oj, "default_options", get_def_opts, 0);
     rb_define_module_function(Oj, "default_options=", set_def_opts, 1);