oj 3.13.7 → 3.13.23

data/ext/oj/oj.c

@@ -32,6 +32,7 @@ ID oj_array_append_id;
 ID oj_array_end_id;
 ID oj_array_start_id;
 ID oj_as_json_id;
+ID oj_at_id;
 ID oj_begin_id;
 ID oj_bigdecimal_id;
 ID oj_end_id;
@@ -45,7 +46,6 @@ ID oj_hash_key_id;
 ID oj_hash_set_id;
 ID oj_hash_start_id;
 ID oj_iconv_id;
-ID oj_instance_variables_id;
 ID oj_json_create_id;
 ID oj_length_id;
 ID oj_new_id;
@@ -90,10 +90,13 @@ VALUE oj_array_class_sym;
 VALUE oj_create_additions_sym;
 VALUE oj_decimal_class_sym;
 VALUE oj_hash_class_sym;
+VALUE oj_in_sym;
 VALUE oj_indent_sym;
+VALUE oj_nanosecond_sym;
 VALUE oj_object_class_sym;
 VALUE oj_quirks_mode_sym;
 VALUE oj_safe_sym;
+VALUE oj_symbolize_names_sym;
 VALUE oj_trace_sym;
 
 static VALUE allow_blank_sym;
@@ -136,6 +139,7 @@ static VALUE rails_sym;
 static VALUE raise_sym;
 static VALUE ruby_sym;
 static VALUE sec_prec_sym;
+static VALUE slash_sym;
 static VALUE strict_sym;
 static VALUE symbol_keys_sym;
 static VALUE time_format_sym;
@@ -152,6 +156,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;
@@ -238,7 +243,7 @@ struct _options oj_default_options = {
  *references
  * - *:auto_define* [_Boolean_|_nil_] automatically define classes if they do not exist
  * - *:symbol_keys* [_Boolean_|_nil_] use symbols instead of strings for hash keys
- * - *:escape_mode* [_:newline_|_:json_|_:xss_safe_|_:ascii_|_unicode_xss_|_nil_] determines the
+ * - *:escape_mode* [_:newline_|_:json_|_:slash_|_:xss_safe_|_:ascii_|_:unicode_xss_|_nil_] determines the
  *characters to escape
  * - *:class_cache* [_Boolean_|_nil_] cache classes for faster parsing (if dynamically modifying
  *classes or reloading classes then don't use this)
@@ -246,7 +251,7 @@ struct _options oj_default_options = {
  *to use for JSON
  * - *:time_format* [_:unix_|_:unix_zone_|_:xmlschema_|_:ruby_] time format when dumping
  * - *:bigdecimal_as_decimal* [_Boolean_|_nil_] dump BigDecimal as a decimal number or as a String
- * - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_|_:fast_] load decimals as BigDecimal instead
+ * - *:bigdecimal_load* [_:bigdecimal_|_:float_|_:auto_|_:fast_|_:ruby_] load decimals as BigDecimal instead
  *of as a Float. :auto pick the most precise for the number of digits. :float should be the same as
  *ruby. :fast may require rounding but is must faster.
  * - *:compat_bigdecimal* [_true_|_false_] load decimals as BigDecimal instead of as a Float when in
@@ -308,106 +313,76 @@ static VALUE get_def_opts(VALUE self) {
     rb_hash_aset(opts, sec_prec_sym, INT2FIX(oj_default_options.sec_prec));
     rb_hash_aset(opts,
                  circular_sym,
-                 (Yes == oj_default_options.circular)
-                     ? Qtrue
-                     : ((No == oj_default_options.circular) ? Qfalse : Qnil));
-    rb_hash_aset(opts,
-                 class_cache_sym,
-                 (Yes == oj_default_options.class_cache)
-                     ? Qtrue
-                     : ((No == oj_default_options.class_cache) ? Qfalse : Qnil));
-    rb_hash_aset(opts,
-                 auto_define_sym,
-                 (Yes == oj_default_options.auto_define)
-                     ? Qtrue
-                     : ((No == oj_default_options.auto_define) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.circular) ? Qtrue : ((No == oj_default_options.circular) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        class_cache_sym,
+        (Yes == oj_default_options.class_cache) ? Qtrue : ((No == oj_default_options.class_cache) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        auto_define_sym,
+        (Yes == oj_default_options.auto_define) ? Qtrue : ((No == oj_default_options.auto_define) ? Qfalse : Qnil));
     rb_hash_aset(opts,
                  symbol_keys_sym,
-                 (Yes == oj_default_options.sym_key)
-                     ? Qtrue
-                     : ((No == oj_default_options.sym_key) ? Qfalse : Qnil));
-    rb_hash_aset(opts,
-                 bigdecimal_as_decimal_sym,
-                 (Yes == oj_default_options.bigdec_as_num)
-                     ? Qtrue
-                     : ((No == oj_default_options.bigdec_as_num) ? Qfalse : Qnil));
-    rb_hash_aset(opts,
-                 oj_create_additions_sym,
-                 (Yes == oj_default_options.create_ok)
-                     ? Qtrue
-                     : ((No == oj_default_options.create_ok) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.sym_key) ? Qtrue : ((No == oj_default_options.sym_key) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        bigdecimal_as_decimal_sym,
+        (Yes == oj_default_options.bigdec_as_num) ? Qtrue : ((No == oj_default_options.bigdec_as_num) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        oj_create_additions_sym,
+        (Yes == oj_default_options.create_ok) ? Qtrue : ((No == oj_default_options.create_ok) ? Qfalse : Qnil));
     rb_hash_aset(opts,
                  use_to_json_sym,
-                 (Yes == oj_default_options.to_json)
-                     ? Qtrue
-                     : ((No == oj_default_options.to_json) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.to_json) ? Qtrue : ((No == oj_default_options.to_json) ? Qfalse : Qnil));
     rb_hash_aset(opts,
                  use_to_hash_sym,
-                 (Yes == oj_default_options.to_hash)
-                     ? Qtrue
-                     : ((No == oj_default_options.to_hash) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.to_hash) ? Qtrue : ((No == oj_default_options.to_hash) ? Qfalse : Qnil));
     rb_hash_aset(opts,
                  use_as_json_sym,
-                 (Yes == oj_default_options.as_json)
-                     ? Qtrue
-                     : ((No == oj_default_options.as_json) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.as_json) ? Qtrue : ((No == oj_default_options.as_json) ? Qfalse : Qnil));
     rb_hash_aset(opts,
                  use_raw_json_sym,
-                 (Yes == oj_default_options.raw_json)
-                     ? Qtrue
-                     : ((No == oj_default_options.raw_json) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.raw_json) ? Qtrue : ((No == oj_default_options.raw_json) ? Qfalse : Qnil));
     rb_hash_aset(opts,
                  nilnil_sym,
-                 (Yes == oj_default_options.nilnil)
-                     ? Qtrue
-                     : ((No == oj_default_options.nilnil) ? Qfalse : Qnil));
-    rb_hash_aset(opts,
-                 empty_string_sym,
-                 (Yes == oj_default_options.empty_string)
-                     ? Qtrue
-                     : ((No == oj_default_options.empty_string) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.nilnil) ? Qtrue : ((No == oj_default_options.nilnil) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        empty_string_sym,
+        (Yes == oj_default_options.empty_string) ? Qtrue : ((No == oj_default_options.empty_string) ? Qfalse : Qnil));
     rb_hash_aset(opts,
                  allow_gc_sym,
-                 (Yes == oj_default_options.allow_gc)
-                     ? Qtrue
-                     : ((No == oj_default_options.allow_gc) ? Qfalse : Qnil));
-    rb_hash_aset(opts,
-                 oj_quirks_mode_sym,
-                 (Yes == oj_default_options.quirks_mode)
-                     ? Qtrue
-                     : ((No == oj_default_options.quirks_mode) ? Qfalse : Qnil));
-    rb_hash_aset(opts,
-                 allow_invalid_unicode_sym,
-                 (Yes == oj_default_options.allow_invalid)
-                     ? Qtrue
-                     : ((No == oj_default_options.allow_invalid) ? Qfalse : Qnil));
-    rb_hash_aset(opts,
-                 oj_allow_nan_sym,
-                 (Yes == oj_default_options.allow_nan)
-                     ? Qtrue
-                     : ((No == oj_default_options.allow_nan) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.allow_gc) ? Qtrue : ((No == oj_default_options.allow_gc) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        oj_quirks_mode_sym,
+        (Yes == oj_default_options.quirks_mode) ? Qtrue : ((No == oj_default_options.quirks_mode) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        allow_invalid_unicode_sym,
+        (Yes == oj_default_options.allow_invalid) ? Qtrue : ((No == oj_default_options.allow_invalid) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        oj_allow_nan_sym,
+        (Yes == oj_default_options.allow_nan) ? Qtrue : ((No == oj_default_options.allow_nan) ? Qfalse : Qnil));
     rb_hash_aset(opts,
                  oj_trace_sym,
-                 (Yes == oj_default_options.trace)
-                     ? Qtrue
-                     : ((No == oj_default_options.trace) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.trace) ? Qtrue : ((No == oj_default_options.trace) ? Qfalse : Qnil));
     rb_hash_aset(opts,
                  oj_safe_sym,
-                 (Yes == oj_default_options.safe)
-                     ? Qtrue
-                     : ((No == oj_default_options.safe) ? Qfalse : Qnil));
+                 (Yes == oj_default_options.safe) ? Qtrue : ((No == oj_default_options.safe) ? Qfalse : Qnil));
     rb_hash_aset(opts, float_prec_sym, INT2FIX(oj_default_options.float_prec));
     rb_hash_aset(opts, cache_str_sym, INT2FIX(oj_default_options.cache_str));
-    rb_hash_aset(opts,
-                 ignore_under_sym,
-                 (Yes == oj_default_options.ignore_under)
-                     ? Qtrue
-                     : ((No == oj_default_options.ignore_under) ? Qfalse : Qnil));
-    rb_hash_aset(opts,
-                 cache_keys_sym,
-                 (Yes == oj_default_options.cache_keys)
-                     ? Qtrue
-                     : ((No == oj_default_options.cache_keys) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        ignore_under_sym,
+        (Yes == oj_default_options.ignore_under) ? Qtrue : ((No == oj_default_options.ignore_under) ? Qfalse : Qnil));
+    rb_hash_aset(
+        opts,
+        cache_keys_sym,
+        (Yes == oj_default_options.cache_keys) ? Qtrue : ((No == oj_default_options.cache_keys) ? Qfalse : Qnil));
     switch (oj_default_options.mode) {
     case StrictMode: rb_hash_aset(opts, mode_sym, strict_sym); break;
     case CompatMode: rb_hash_aset(opts, mode_sym, compat_sym); break;
@@ -433,6 +408,7 @@ static VALUE get_def_opts(VALUE self) {
     switch (oj_default_options.escape_mode) {
     case NLEsc: rb_hash_aset(opts, escape_mode_sym, newline_sym); break;
     case JSONEsc: rb_hash_aset(opts, escape_mode_sym, json_sym); break;
+    case SlashEsc: rb_hash_aset(opts, escape_mode_sym, slash_sym); break;
     case XSSEsc: rb_hash_aset(opts, escape_mode_sym, xss_safe_sym); break;
     case ASCIIEsc: rb_hash_aset(opts, escape_mode_sym, ascii_sym); break;
     case JXEsc: rb_hash_aset(opts, escape_mode_sym, unicode_xss_sym); break;
@@ -453,30 +429,25 @@ static VALUE get_def_opts(VALUE self) {
     default: rb_hash_aset(opts, bigdecimal_load_sym, auto_sym); break;
     }
     rb_hash_aset(opts, compat_bigdecimal_sym, oj_default_options.compat_bigdec ? Qtrue : Qfalse);
+    rb_hash_aset(opts,
+                 create_id_sym,
+                 (NULL == oj_default_options.create_id) ? Qnil : rb_str_new2(oj_default_options.create_id));
     rb_hash_aset(
         opts,
-        create_id_sym,
-        (NULL == oj_default_options.create_id) ? Qnil : rb_str_new2(oj_default_options.create_id));
-    rb_hash_aset(opts,
-                 oj_space_sym,
-                 (0 == oj_default_options.dump_opts.after_size)
-                     ? Qnil
-                     : rb_str_new2(oj_default_options.dump_opts.after_sep));
-    rb_hash_aset(opts,
-                 oj_space_before_sym,
-                 (0 == oj_default_options.dump_opts.before_size)
-                     ? Qnil
-                     : rb_str_new2(oj_default_options.dump_opts.before_sep));
-    rb_hash_aset(opts,
-                 oj_object_nl_sym,
-                 (0 == oj_default_options.dump_opts.hash_size)
-                     ? Qnil
-                     : rb_str_new2(oj_default_options.dump_opts.hash_nl));
-    rb_hash_aset(opts,
-                 oj_array_nl_sym,
-                 (0 == oj_default_options.dump_opts.array_size)
-                     ? Qnil
-                     : rb_str_new2(oj_default_options.dump_opts.array_nl));
+        oj_space_sym,
+        (0 == oj_default_options.dump_opts.after_size) ? Qnil : rb_str_new2(oj_default_options.dump_opts.after_sep));
+    rb_hash_aset(
+        opts,
+        oj_space_before_sym,
+        (0 == oj_default_options.dump_opts.before_size) ? Qnil : rb_str_new2(oj_default_options.dump_opts.before_sep));
+    rb_hash_aset(
+        opts,
+        oj_object_nl_sym,
+        (0 == oj_default_options.dump_opts.hash_size) ? Qnil : rb_str_new2(oj_default_options.dump_opts.hash_nl));
+    rb_hash_aset(
+        opts,
+        oj_array_nl_sym,
+        (0 == oj_default_options.dump_opts.array_size) ? Qnil : rb_str_new2(oj_default_options.dump_opts.array_nl));
 
     switch (oj_default_options.dump_opts.nan_dump) {
     case NullNan: rb_hash_aset(opts, nan_sym, null_sym); break;
@@ -584,16 +555,14 @@ static VALUE set_def_opts(VALUE self, VALUE opts) {
     return Qnil;
 }
 
-bool oj_hash_has_key(VALUE hash, VALUE key)
-{
+bool oj_hash_has_key(VALUE hash, VALUE key) {
     if (Qundef == rb_hash_lookup2(hash, key, Qundef)) {
         return false;
     }
     return true;
 }
 
-bool set_yesno_options(VALUE key, VALUE value, Options copts)
-{
+bool set_yesno_options(VALUE key, VALUE value, Options copts) {
     struct _yesNoOpt ynos[] = {{circular_sym, &copts->circular},
                                {auto_define_sym, &copts->auto_define},
                                {symbol_keys_sym, &copts->sym_key},
@@ -616,29 +585,26 @@ bool set_yesno_options(VALUE key, VALUE value, Options copts)
                                {oj_create_additions_sym, &copts->create_ok},
                                {cache_keys_sym, &copts->cache_keys},
                                {Qnil, 0}};
-    YesNoOpt o;
-
-     for (o = ynos; 0 != o->attr; o++) {
-         if (key == o->sym) {
-             if (Qnil == value) {
-                 *o->attr = NotSet;
-             } else if (Qtrue == value) {
-                 *o->attr = Yes;
-             } else if (Qfalse == value) {
-                 *o->attr = No;
-             } else {
-                 rb_raise(rb_eArgError,
-                          "%s must be true, false, or nil.",
-                          rb_id2name(key));
-             }
-             return true;
-         }
-     }
+    YesNoOpt         o;
+
+    for (o = ynos; 0 != o->attr; o++) {
+        if (key == o->sym) {
+            if (Qnil == value) {
+                *o->attr = NotSet;
+            } else if (Qtrue == value) {
+                *o->attr = Yes;
+            } else if (Qfalse == value) {
+                *o->attr = No;
+            } else {
+                rb_raise(rb_eArgError, "%s must be true, false, or nil.", rb_id2name(key));
+            }
+            return true;
+        }
+    }
     return false;
 }
 
-static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
-{
+static int parse_options_cb(VALUE k, VALUE v, VALUE opts) {
     Options copts = (Options)opts;
     size_t  len;
 
@@ -753,8 +719,7 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
         } else if (rails_sym == v) {
             copts->mode = RailsMode;
         } else {
-            rb_raise(rb_eArgError,
-                     ":mode must be :object, :strict, :compat, :null, :custom, :rails, or :wab.");
+            rb_raise(rb_eArgError, ":mode must be :object, :strict, :compat, :null, :custom, :rails, or :wab.");
         }
     } else if (time_format_sym == k) {
         if (unix_sym == v) {
@@ -773,6 +738,8 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
             copts->escape_mode = NLEsc;
         } else if (json_sym == v) {
             copts->escape_mode = JSONEsc;
+        } else if (slash_sym == v) {
+            copts->escape_mode = SlashEsc;
         } else if (xss_safe_sym == v) {
             copts->escape_mode = XSSEsc;
         } else if (ascii_sym == v) {
@@ -780,8 +747,7 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
         } else if (unicode_xss_sym == v) {
             copts->escape_mode = JXEsc;
         } else {
-            rb_raise(rb_eArgError,
-                     ":encoding must be :newline, :json, :xss_safe, :unicode_xss, or :ascii.");
+            rb_raise(rb_eArgError, ":encoding must be :newline, :json, :xss_safe, :unicode_xss, or :ascii.");
         }
     } else if (bigdecimal_load_sym == k) {
         if (Qnil == v) {
@@ -892,7 +858,6 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
         if (Qnil == v) {
             return ST_CONTINUE;
         }
-
         if (null_sym == v) {
             copts->dump_opts.nan_dump = NullNan;
         } else if (huge_sym == v) {
@@ -910,7 +875,6 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
         if (Qnil == v) {
             return ST_CONTINUE;
         }
-
         if (Qtrue == v) {
             copts->dump_opts.omit_nil = true;
         } else if (Qfalse == v) {
@@ -918,7 +882,7 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
         } else {
             rb_raise(rb_eArgError, ":omit_nil must be true or false.");
         }
-    } else if(oj_ascii_only_sym == k) {
+    } else if (oj_ascii_only_sym == k) {
         // This is here only for backwards compatibility with the original Oj.
         if (Qtrue == v) {
             copts->escape_mode = ASCIIEsc;
@@ -959,7 +923,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;
             }
@@ -968,8 +932,7 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
         if (Qnil == v) {
             return ST_CONTINUE;
         }
-
-        if (TYPE(v) == T_STRUCT && rb_obj_class(v) == rb_cRange) {
+        if (rb_obj_class(v) == rb_cRange) {
             VALUE min = rb_funcall(v, oj_begin_id, 0);
             VALUE max = rb_funcall(v, oj_end_id, 0);
 
@@ -982,8 +945,12 @@ static int parse_options_cb(VALUE k, VALUE v, VALUE opts)
         } else if (Qfalse != v) {
             rb_raise(rb_eArgError, ":integer_range must be a range of Fixnum.");
         }
+    } else if (symbol_keys_sym == k || oj_symbolize_names_sym == k) {
+        if (Qnil == v) {
+            return ST_CONTINUE;
+        }
+	copts->sym_key = (Qtrue == v) ? Yes : No;
     }
-
     return ST_CONTINUE;
 }
 
@@ -1014,9 +981,7 @@ static int match_string_cb(VALUE key, VALUE value, VALUE rx) {
             rb_raise(rb_eArgError, "%s", rc->err);
         }
         break;
-    default:
-        rb_raise(rb_eArgError, "for :match_string, keys must either a String or RegExp.");
-        break;
+    default: rb_raise(rb_eArgError, "for :match_string, keys must either a String or RegExp."); break;
     }
     return ST_CONTINUE;
 }
@@ -1184,14 +1149,22 @@ static VALUE load_file(int argc, VALUE *argv, VALUE self) {
             } else if (wab_sym == v) {
                 mode = WabMode;
             } else {
-                rb_raise(
-                    rb_eArgError,
-                    ":mode must be :object, :strict, :compat, :null, :custom, :rails, or :wab.");
+                rb_raise(rb_eArgError, ":mode must be :object, :strict, :compat, :null, :custom, :rails, or :wab.");
             }
         }
     }
     path = StringValuePtr(*argv);
-    if (0 == (fd = open(path, O_RDONLY))) {
+#ifdef _WIN32
+    {
+        WCHAR *wide_path;
+        wide_path = rb_w32_mbstr_to_wstr(CP_UTF8, path, -1, NULL);
+        fd = rb_w32_wopen(wide_path, O_RDONLY);
+        free(wide_path);
+    }
+#else
+    fd = open(path, O_RDONLY);
+#endif
+    if (0 == fd) {
         rb_raise(rb_eIOError, "%s", strerror(errno));
     }
     switch (mode) {
@@ -1264,16 +1237,15 @@ static VALUE safe_load(VALUE self, VALUE doc) {
  */
 
 struct dump_arg {
-    struct _out     *out;
+    struct _out *    out;
     struct _options *copts;
-    int    argc;
-    VALUE *argv;
+    int              argc;
+    VALUE *          argv;
 };
 
-static VALUE dump_body(VALUE a)
-{
+static VALUE dump_body(VALUE a) {
     volatile struct dump_arg *arg = (void *)a;
-    VALUE           rstr;
+    VALUE                     rstr;
 
     oj_dump_obj_to_json_using_params(*arg->argv, arg->copts, arg->out, arg->argc - 1, arg->argv + 1);
     if (0 == arg->out->buf) {
@@ -1285,13 +1257,11 @@ static VALUE dump_body(VALUE a)
     return rstr;
 }
 
-static VALUE dump_ensure(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;
 }
 
@@ -1303,7 +1273,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;
@@ -1320,14 +1289,13 @@ static VALUE dump(int argc, VALUE *argv, VALUE self) {
     if (CompatMode == copts.mode && copts.escape_mode != ASCIIEsc) {
         copts.escape_mode = JSONEsc;
     }
-    arg.out = &out;
+    arg.out   = &out;
     arg.copts = &copts;
-    arg.argc = argc;
-    arg.argv = argv;
+    arg.argc  = argc;
+    arg.argv  = argv;
+
+    oj_out_init(arg.out);
 
-    arg.out->buf       = buf;
-    arg.out->end       = buf + sizeof(buf) - 10;
-    arg.out->allocated = false;
     arg.out->omit_nil  = copts.dump_opts.omit_nil;
     arg.out->caller    = CALLER_DUMP;
 
@@ -1359,7 +1327,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;
@@ -1374,9 +1341,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.
@@ -1387,9 +1354,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;
 }
 
@@ -1749,6 +1716,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
@@ -1777,15 +1753,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();
@@ -1794,9 +1774,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);
@@ -1835,6 +1817,7 @@ void Init_oj() {
     oj_array_end_id          = rb_intern("array_end");
     oj_array_start_id        = rb_intern("array_start");
     oj_as_json_id            = rb_intern("as_json");
+    oj_at_id                 = rb_intern("at");
     oj_begin_id              = rb_intern("begin");
     oj_bigdecimal_id         = rb_intern("BigDecimal");
     oj_end_id                = rb_intern("end");
@@ -1848,7 +1831,6 @@ void Init_oj() {
     oj_hash_set_id           = rb_intern("hash_set");
     oj_hash_start_id         = rb_intern("hash_start");
     oj_iconv_id              = rb_intern("iconv");
-    oj_instance_variables_id = rb_intern("instance_variables");
     oj_json_create_id        = rb_intern("json_create");
     oj_length_id             = rb_intern("length");
     oj_new_id                = rb_intern("new");
@@ -1983,10 +1965,14 @@ void Init_oj() {
     rb_gc_register_address(&oj_decimal_class_sym);
     oj_hash_class_sym = ID2SYM(rb_intern("hash_class"));
     rb_gc_register_address(&oj_hash_class_sym);
+    oj_in_sym = ID2SYM(rb_intern("in"));
+    rb_gc_register_address(&oj_in_sym);
     oj_indent_sym = ID2SYM(rb_intern("indent"));
     rb_gc_register_address(&oj_indent_sym);
     oj_max_nesting_sym = ID2SYM(rb_intern("max_nesting"));
     rb_gc_register_address(&oj_max_nesting_sym);
+    oj_nanosecond_sym = ID2SYM(rb_intern("nanosecond"));
+    rb_gc_register_address(&oj_nanosecond_sym);
     oj_object_class_sym = ID2SYM(rb_intern("object_class"));
     rb_gc_register_address(&oj_object_class_sym);
     oj_object_nl_sym = ID2SYM(rb_intern("object_nl"));
@@ -2011,10 +1997,14 @@ void Init_oj() {
     rb_gc_register_address(&ruby_sym);
     sec_prec_sym = ID2SYM(rb_intern("second_precision"));
     rb_gc_register_address(&sec_prec_sym);
+    slash_sym = ID2SYM(rb_intern("slash"));
+    rb_gc_register_address(&slash_sym);
     strict_sym = ID2SYM(rb_intern("strict"));
     rb_gc_register_address(&strict_sym);
     symbol_keys_sym = ID2SYM(rb_intern("symbol_keys"));
     rb_gc_register_address(&symbol_keys_sym);
+    oj_symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));
+    rb_gc_register_address(&oj_symbolize_names_sym);
     time_format_sym = ID2SYM(rb_intern("time_format"));
     rb_gc_register_address(&time_format_sym);
     unicode_xss_sym = ID2SYM(rb_intern("unicode_xss"));
@@ -2061,4 +2051,5 @@ void Init_oj() {
     oj_init_doc();
 
     oj_parser_init();
+    oj_scanner_init();
 }