oj 3.13.23 → 3.16.9

data/ext/oj/rails.c

@@ -5,6 +5,7 @@
 
 #include "code.h"
 #include "encode.h"
+#include "mem.h"
 #include "trace.h"
 #include "util.h"
 
@@ -15,7 +16,7 @@ typedef struct _encoder {
     struct _rOptTable ropts;
     struct _options   opts;
     VALUE             arg;
-} * Encoder;
+} *Encoder;
 
 bool oj_rails_hash_opt  = false;
 bool oj_rails_array_opt = false;
@@ -76,7 +77,7 @@ static ROptTable copy_opts(ROptTable src, ROptTable dest) {
     if (NULL == src->table) {
         dest->table = NULL;
     } else {
-        dest->table = ALLOC_N(struct _rOpt, dest->alen);
+        dest->table = OJ_R_ALLOC_N(struct _rOpt, dest->alen);
         memcpy(dest->table, src->table, sizeof(struct _rOpt) * dest->alen);
     }
     return NULL;
@@ -140,7 +141,7 @@ static void dump_struct(VALUE obj, int depth, Out out, bool as_ok) {
     int            cnt;
     int            i;
     int            len;
-    const char *   name;
+    const char    *name;
 
 #ifdef RSTRUCT_LEN
 #if RSTRUCT_LEN_RETURNS_INTEGER_OBJECT
@@ -198,8 +199,8 @@ static void dump_enumerable(VALUE obj, int depth, Out out, bool as_ok) {
 }
 
 static void dump_bigdecimal(VALUE obj, int depth, Out out, bool as_ok) {
-    volatile VALUE rstr = rb_funcall(obj, oj_to_s_id, 0);
-    const char *   str  = RSTRING_PTR(rstr);
+    volatile VALUE rstr = oj_safe_string_convert(obj);
+    const char    *str  = RSTRING_PTR(rstr);
 
     if ('I' == *str || 'N' == *str || ('-' == *str && 'I' == str[1])) {
         oj_dump_nil(Qnil, depth, out, false);
@@ -262,14 +263,7 @@ static void dump_sec_nano(VALUE obj, int64_t sec, long nsec, Out out) {
                       tzmin);
     } else if (0 == out->opts->sec_prec) {
         if (0 == tzsecs && rb_funcall2(obj, oj_utcq_id, 0, 0)) {
-            len = sprintf(buf,
-                          "%04d-%02d-%02dT%02d:%02d:%02dZ",
-                          ti.year,
-                          ti.mon,
-                          ti.day,
-                          ti.hour,
-                          ti.min,
-                          ti.sec);
+            len = sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02dZ", ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec);
         } else {
             len = sprintf(buf,
                           "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
@@ -300,18 +294,7 @@ static void dump_sec_nano(VALUE obj, int64_t sec, long nsec, Out out) {
             format[32] = '0' + out->opts->sec_prec;
             len -= 9 - out->opts->sec_prec;
         }
-        len = sprintf(buf,
-                      format,
-                      ti.year,
-                      ti.mon,
-                      ti.day,
-                      ti.hour,
-                      ti.min,
-                      ti.sec,
-                      nsec,
-                      tzsign,
-                      tzhour,
-                      tzmin);
+        len = sprintf(buf, format, ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec, nsec, tzsign, tzhour, tzmin);
     }
     oj_dump_cstr(buf, len, 0, 0, out);
 }
@@ -345,7 +328,7 @@ static void dump_timewithzone(VALUE obj, int depth, Out out, bool as_ok) {
 }
 
 static void dump_to_s(VALUE obj, int depth, Out out, bool as_ok) {
-    volatile VALUE rstr = rb_funcall(obj, oj_to_s_id, 0);
+    volatile VALUE rstr = oj_safe_string_convert(obj);
 
     oj_dump_cstr(RSTRING_PTR(rstr), (int)RSTRING_LEN(rstr), 0, 0, out);
 }
@@ -355,7 +338,7 @@ static ID parameters_id = 0;
 typedef struct _strLen {
     const char *str;
     int         len;
-} * StrLen;
+} *StrLen;
 
 static void dump_actioncontroller_parameters(VALUE obj, int depth, Out out, bool as_ok) {
     if (0 == parameters_id) {
@@ -373,11 +356,11 @@ static StrLen columns_array(VALUE rcols, int *ccnt) {
     int            cnt = (int)RARRAY_LEN(rcols);
 
     *ccnt = cnt;
-    cols  = ALLOC_N(struct _strLen, cnt);
+    cols  = OJ_R_ALLOC_N(struct _strLen, cnt);
     for (i = 0, cp = cols; i < cnt; i++, cp++) {
         v = RARRAY_AREF(rcols, i);
         if (T_STRING != rb_type(v)) {
-            v = rb_funcall(v, oj_to_s_id, 0);
+            v = oj_safe_string_convert(v);
         }
         cp->str = StringValuePtr(v);
         cp->len = (int)RSTRING_LEN(v);
@@ -481,7 +464,7 @@ static void dump_activerecord_result(VALUE obj, int depth, Out out, bool as_ok)
             *out->cur++ = ',';
         }
     }
-    xfree(cols);
+    OJ_R_FREE(cols);
     size = depth * out->indent + 1;
     assure_size(out, size);
     if (out->opts->dump_opts.use) {
@@ -504,7 +487,7 @@ static void dump_activerecord_result(VALUE obj, int depth, Out out, bool as_ok)
 typedef struct _namedFunc {
     const char *name;
     DumpFunc    func;
-} * NamedFunc;
+} *NamedFunc;
 
 static void dump_as_string(VALUE obj, int depth, Out out, bool as_ok) {
     if (oj_code_dump(oj_compat_codes, obj, depth, out)) {
@@ -517,9 +500,7 @@ static void dump_as_string(VALUE obj, int depth, Out out, bool as_ok) {
 static void dump_as_json(VALUE obj, int depth, Out out, bool as_ok) {
     volatile VALUE ja;
 
-    if (RB_UNLIKELY(Yes == out->opts->trace)) {
-        oj_trace("as_json", obj, __FILE__, __LINE__, depth + 1, TraceRubyIn);
-    }
+    TRACE(out->opts->trace, "as_json", obj, depth + 1, TraceRubyIn);
     // Some classes elect to not take an options argument so check the arity
     // of as_json.
     if (0 == rb_obj_method_arity(obj, oj_as_json_id)) {
@@ -527,9 +508,7 @@ static void dump_as_json(VALUE obj, int depth, Out out, bool as_ok) {
     } else {
         ja = rb_funcall2(obj, oj_as_json_id, out->argc, out->argv);
     }
-    if (RB_UNLIKELY(Yes == out->opts->trace)) {
-        oj_trace("as_json", obj, __FILE__, __LINE__, depth + 1, TraceRubyOut);
-    }
+    TRACE(out->opts->trace, "as_json", obj, depth + 1, TraceRubyOut);
 
     out->argc = 0;
     if (ja == obj || !as_ok) {
@@ -587,11 +566,11 @@ static ROpt create_opt(ROptTable rot, VALUE clas) {
     rot->len++;
     if (NULL == rot->table) {
         rot->alen  = 256;
-        rot->table = ALLOC_N(struct _rOpt, rot->alen);
+        rot->table = OJ_R_ALLOC_N(struct _rOpt, rot->alen);
         memset(rot->table, 0, sizeof(struct _rOpt) * rot->alen);
     } else if (rot->alen <= rot->len) {
         rot->alen *= 2;
-        REALLOC_N(rot->table, struct _rOpt, rot->alen);
+        OJ_R_REALLOC_N(rot->table, struct _rOpt, rot->alen);
         memset(rot->table + olen, 0, sizeof(struct _rOpt) * olen);
     }
     if (0 == olen) {
@@ -644,9 +623,9 @@ static void encoder_free(void *ptr) {
         Encoder e = (Encoder)ptr;
 
         if (NULL != e->ropts.table) {
-            xfree(e->ropts.table);
+            OJ_R_FREE(e->ropts.table);
         }
-        xfree(ptr);
+        OJ_R_FREE(ptr);
     }
 }
 
@@ -660,6 +639,17 @@ static void encoder_mark(void *ptr) {
     }
 }
 
+static const rb_data_type_t oj_encoder_type = {
+    "Oj/encoder",
+    {
+        encoder_mark,
+        encoder_free,
+        NULL,
+    },
+    0,
+    0,
+};
+
 /* Document-method: new
  *	call-seq: new(options=nil)
  *
@@ -667,7 +657,7 @@ static void encoder_mark(void *ptr) {
  * - *options* [_Hash_] formatting options
  */
 static VALUE encoder_new(int argc, VALUE *argv, VALUE self) {
-    Encoder e = ALLOC(struct _encoder);
+    Encoder e = OJ_R_ALLOC(struct _encoder);
 
     e->opts = oj_default_options;
     e->arg  = Qnil;
@@ -677,14 +667,14 @@ static VALUE encoder_new(int argc, VALUE *argv, VALUE self) {
         oj_parse_options(*argv, &e->opts);
         e->arg = *argv;
     }
-    return Data_Wrap_Struct(encoder_class, encoder_mark, encoder_free, e);
+    return TypedData_Wrap_Struct(encoder_class, &oj_encoder_type, e);
 }
 
 static VALUE resolve_classpath(const char *name) {
     char        class_name[1024];
     VALUE       clas;
-    char *      end = class_name + sizeof(class_name) - 1;
-    char *      s;
+    char       *end = class_name + sizeof(class_name) - 1;
+    char       *s;
     const char *n = name;
     ID          cid;
 
@@ -750,8 +740,7 @@ static void optimize(int argc, VALUE *argv, ROptTable rot, bool on) {
             oj_rails_float_opt = on;
         } else if (oj_string_writer_class == *argv) {
             string_writer_optimized = on;
-        } else if (NULL != (ro = oj_rails_get_opt(rot, *argv)) ||
-                   NULL != (ro = create_opt(rot, *argv))) {
+        } else if (NULL != (ro = oj_rails_get_opt(rot, *argv)) || NULL != (ro = create_opt(rot, *argv))) {
             ro->on = on;
         }
     }
@@ -770,7 +759,8 @@ static void optimize(int argc, VALUE *argv, ROptTable rot, bool on) {
  * - *classes* [_Class_] a list of classes to optimize
  */
 static VALUE encoder_optimize(int argc, VALUE *argv, VALUE self) {
-    Encoder e = (Encoder)DATA_PTR(self);
+    Encoder e;
+    TypedData_Get_Struct(self, struct _encoder, &oj_encoder_type, e);
 
     optimize(argc, argv, &e->ropts, true);
 
@@ -813,7 +803,7 @@ rails_mimic_json(VALUE self) {
     }
     oj_mimic_json_methods(json);
     // Setting the default mode breaks the prmoise in the docs not to.
-    //oj_default_options.mode = RailsMode;
+    // oj_default_options.mode = RailsMode;
 
     return Qnil;
 }
@@ -826,7 +816,8 @@ rails_mimic_json(VALUE self) {
  * - *classes* [_Class_] a list of classes to deoptimize
  */
 static VALUE encoder_deoptimize(int argc, VALUE *argv, VALUE self) {
-    Encoder e = (Encoder)DATA_PTR(self);
+    Encoder e;
+    TypedData_Get_Struct(self, struct _encoder, &oj_encoder_type, e);
 
     optimize(argc, argv, &e->ropts, false);
 
@@ -855,8 +846,11 @@ static VALUE rails_deoptimize(int argc, VALUE *argv, VALUE self) {
  * @return true if the class is being optimized for rails and false otherwise
  */
 static VALUE encoder_optimized(VALUE self, VALUE clas) {
-    Encoder e  = (Encoder)DATA_PTR(self);
-    ROpt    ro = oj_rails_get_opt(&e->ropts, clas);
+    Encoder e;
+    ROpt    ro;
+
+    TypedData_Get_Struct(self, struct _encoder, &oj_encoder_type, e);
+    ro = oj_rails_get_opt(&e->ropts, clas);
 
     if (NULL == ro) {
         return Qfalse;
@@ -881,7 +875,7 @@ static VALUE rails_optimized(VALUE self, VALUE clas) {
 typedef struct _oo {
     Out   out;
     VALUE obj;
-} * OO;
+} *OO;
 
 static VALUE protect_dump(VALUE ov) {
     OO oo = (OO)ov;
@@ -911,16 +905,15 @@ static VALUE encode(VALUE obj, ROptTable ropts, Options opts, int argc, VALUE *a
 
     oj_out_init(&out);
 
-    out.omit_nil  = copts.dump_opts.omit_nil;
-    out.caller    = 0;
-    out.cur       = out.buf;
-    out.circ_cnt  = 0;
-    out.opts      = &copts;
-    out.hash_cnt  = 0;
-    out.indent    = copts.indent;
-    out.argc      = argc;
-    out.argv      = argv;
-    out.ropts     = ropts;
+    out.omit_nil = copts.dump_opts.omit_nil;
+    out.cur      = out.buf;
+    out.circ_cnt = 0;
+    out.opts     = &copts;
+    out.hash_cnt = 0;
+    out.indent   = copts.indent;
+    out.argc     = argc;
+    out.argv     = argv;
+    out.ropts    = ropts;
     if (Yes == copts.circular) {
         oj_cache8_new(&out.circ_cache);
     }
@@ -963,7 +956,8 @@ static VALUE encode(VALUE obj, ROptTable ropts, Options opts, int argc, VALUE *a
  * Returns encoded object as a JSON string.
  */
 static VALUE encoder_encode(VALUE self, VALUE obj) {
-    Encoder e = (Encoder)DATA_PTR(self);
+    Encoder e;
+    TypedData_Get_Struct(self, struct _encoder, &oj_encoder_type, e);
 
     if (Qnil != e->arg) {
         VALUE argv[1] = {e->arg};
@@ -1065,28 +1059,16 @@ static VALUE rails_set_encoder(VALUE self) {
     verbose = rb_gv_get("$VERBOSE");
     rb_gv_set("$VERBOSE", Qfalse);
     rb_undef_method(encoding, "use_standard_json_time_format=");
-    rb_define_module_function(encoding,
-                              "use_standard_json_time_format=",
-                              rails_use_standard_json_time_format,
-                              1);
+    rb_define_module_function(encoding, "use_standard_json_time_format=", rails_use_standard_json_time_format, 1);
     rb_undef_method(encoding, "use_standard_json_time_format");
-    rb_define_module_function(encoding,
-                              "use_standard_json_time_format",
-                              rails_use_standard_json_time_format_get,
-                              0);
+    rb_define_module_function(encoding, "use_standard_json_time_format", rails_use_standard_json_time_format_get, 0);
 
     pv          = rb_iv_get(encoding, "@escape_html_entities_in_json");
     escape_html = Qtrue == pv;
     rb_undef_method(encoding, "escape_html_entities_in_json=");
-    rb_define_module_function(encoding,
-                              "escape_html_entities_in_json=",
-                              rails_escape_html_entities_in_json,
-                              1);
+    rb_define_module_function(encoding, "escape_html_entities_in_json=", rails_escape_html_entities_in_json, 1);
     rb_undef_method(encoding, "escape_html_entities_in_json");
-    rb_define_module_function(encoding,
-                              "escape_html_entities_in_json",
-                              rails_escape_html_entities_in_json_get,
-                              0);
+    rb_define_module_function(encoding, "escape_html_entities_in_json", rails_escape_html_entities_in_json_get, 0);
 
     pv                              = rb_iv_get(encoding, "@time_precision");
     oj_default_options.sec_prec     = NUM2INT(pv);
@@ -1119,6 +1101,8 @@ static VALUE rails_set_decoder(VALUE self) {
     } else {
         json_error = rb_define_class_under(json, "JSONError", rb_eStandardError);
     }
+
+    rb_global_variable(&oj_json_parser_error_class);
     if (rb_const_defined_at(json, rb_intern("ParserError"))) {
         oj_json_parser_error_class = rb_const_get(json, rb_intern("ParserError"));
     } else {
@@ -1188,7 +1172,7 @@ static void dump_to_hash(VALUE obj, int depth, Out out) {
 
 static void dump_float(VALUE obj, int depth, Out out, bool as_ok) {
     char   buf[64];
-    char * b;
+    char  *b;
     double d   = rb_num2dbl(obj);
     int    cnt = 0;
 
@@ -1208,7 +1192,7 @@ static void dump_float(VALUE obj, int depth, Out out, bool as_ok) {
         } else if (oj_rails_float_opt) {
             cnt = oj_dump_float_printf(buf, sizeof(buf), obj, d, "%0.16g");
         } else {
-            volatile VALUE rstr = rb_funcall(obj, oj_to_s_id, 0);
+            volatile VALUE rstr = oj_safe_string_convert(obj);
 
             strcpy(buf, RSTRING_PTR(rstr));
             cnt = (int)RSTRING_LEN(rstr);
@@ -1301,7 +1285,7 @@ static int hash_cb(VALUE key, VALUE value, VALUE ov) {
         return ST_CONTINUE;
     }
     if (rtype != T_STRING && rtype != T_SYMBOL) {
-        key   = rb_funcall(key, oj_to_s_id, 0);
+        key   = oj_safe_string_convert(key);
         rtype = rb_type(key);
     }
     if (!out->opts->dump_opts.use) {
@@ -1464,9 +1448,7 @@ static DumpFunc rails_funcs[] = {
 static void dump_rails_val(VALUE obj, int depth, Out out, bool as_ok) {
     int type = rb_type(obj);
 
-    if (RB_UNLIKELY(Yes == out->opts->trace)) {
-        oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceIn);
-    }
+    TRACE(out->opts->trace, "dump", obj, depth, TraceIn);
     if (MAX_DEPTH < depth) {
         rb_raise(rb_eNoMemError, "Too deeply nested.\n");
     }
@@ -1475,16 +1457,12 @@ static void dump_rails_val(VALUE obj, int depth, Out out, bool as_ok) {
 
         if (NULL != f) {
             f(obj, depth, out, as_ok);
-            if (RB_UNLIKELY(Yes == out->opts->trace)) {
-                oj_trace("dump", obj, __FILE__, __LINE__, depth, TraceOut);
-            }
+            TRACE(out->opts->trace, "dump", obj, depth, TraceOut);
             return;
         }
     }
     oj_dump_nil(Qnil, depth, out, false);
-    if (RB_UNLIKELY(Yes == out->opts->trace)) {
-        oj_trace("dump", Qnil, __FILE__, __LINE__, depth, TraceOut);
-    }
+    TRACE(out->opts->trace, "dump", Qnil, depth, TraceOut);
 }
 
 void oj_dump_rails_val(VALUE obj, int depth, Out out) {

data/ext/oj/reader.c

@@ -14,6 +14,7 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "mem.h"
 #include "oj.h"
 #include "reader.h"
 #include "ruby.h"
@@ -63,8 +64,7 @@ void oj_reader_init(Reader reader, VALUE io, int fd, bool to_s) {
         reader->tail      = reader->head;
         reader->read_end  = reader->head + RSTRING_LEN(s);
     } else if (rb_cFile == io_class && Qnil != (stat = rb_funcall(io, oj_stat_id, 0)) &&
-               Qnil != (ftype = rb_funcall(stat, oj_ftype_id, 0)) &&
-               0 == strcmp("file", StringValuePtr(ftype)) &&
+               Qnil != (ftype = rb_funcall(stat, oj_ftype_id, 0)) && 0 == strcmp("file", StringValuePtr(ftype)) &&
                0 == FIX2INT(rb_funcall(io, oj_pos_id, 0))) {
         reader->read_func = read_from_fd;
         reader->fd        = FIX2INT(rb_funcall(io, oj_fileno_id, 0));
@@ -75,7 +75,7 @@ void oj_reader_init(Reader reader, VALUE io, int fd, bool to_s) {
         reader->read_func = read_from_io;
         reader->io        = io;
     } else if (to_s) {
-        volatile VALUE rstr = rb_funcall(io, oj_to_s_id, 0);
+        volatile VALUE rstr = oj_safe_string_convert(io);
 
         reader->read_func = 0;
         reader->in_str    = StringValuePtr(rstr);
@@ -83,8 +83,7 @@ void oj_reader_init(Reader reader, VALUE io, int fd, bool to_s) {
         reader->tail      = reader->head;
         reader->read_end  = reader->head + RSTRING_LEN(rstr);
     } else {
-        rb_raise(rb_eArgError,
-                 "parser io argument must be a String or respond to readpartial() or read().\n");
+        rb_raise(rb_eArgError, "parser io argument must be a String or respond to readpartial() or read().\n");
     }
 }
 
@@ -107,10 +106,10 @@ int oj_reader_read(Reader reader) {
             size_t      size = reader->end - reader->head + BUF_PAD;
 
             if (reader->head == reader->base) {
-                reader->head = ALLOC_N(char, size * 2);
+                reader->head = OJ_R_ALLOC_N(char, size * 2);
                 memcpy((char *)reader->head, old, size);
             } else {
-                REALLOC_N(reader->head, char, size * 2);
+                OJ_R_REALLOC_N(reader->head, char, size * 2);
             }
             reader->free_head = 1;
             reader->end       = reader->head + size * 2 - BUF_PAD;
@@ -123,9 +122,7 @@ int oj_reader_read(Reader reader) {
                 reader->str = reader->head + (reader->str - old);
             }
         } else {
-            memmove((char *)reader->head,
-                    reader->head + shift,
-                    reader->read_end - (reader->head + shift));
+            memmove((char *)reader->head, reader->head + shift, reader->read_end - (reader->head + shift));
             reader->tail -= shift;
             reader->read_end -= shift;
             if (0 != reader->pro) {
@@ -157,7 +154,7 @@ static VALUE partial_io_cb(VALUE rbuf) {
     Reader reader = (Reader)rbuf;
     VALUE  args[1];
     VALUE  rstr;
-    char * str;
+    char  *str;
     size_t cnt;
 
     args[0] = ULONG2NUM(reader->end - reader->tail);
@@ -167,7 +164,6 @@ static VALUE partial_io_cb(VALUE rbuf) {
     }
     str = StringValuePtr(rstr);
     cnt = RSTRING_LEN(rstr);
-    // printf("*** partial read %lu bytes, str: '%s'\n", cnt, str);
     strcpy(reader->tail, str);
     reader->read_end = reader->tail + cnt;
 
@@ -178,7 +174,7 @@ static VALUE io_cb(VALUE rbuf) {
     Reader reader = (Reader)rbuf;
     VALUE  args[1];
     VALUE  rstr;
-    char * str;
+    char  *str;
     size_t cnt;
 
     args[0] = ULONG2NUM(reader->end - reader->tail);
@@ -188,7 +184,6 @@ static VALUE io_cb(VALUE rbuf) {
     }
     str = StringValuePtr(rstr);
     cnt = RSTRING_LEN(rstr);
-    // printf("*** read %lu bytes, str: '%s'\n", cnt, str);
     strcpy(reader->tail, str);
     reader->read_end = reader->tail + cnt;
 

data/ext/oj/reader.h

@@ -4,6 +4,8 @@
 #ifndef OJ_READER_H
 #define OJ_READER_H
 
+#include "mem.h"
+
 typedef struct _reader {
     char  base[0x00001000];
     char *head;
@@ -22,7 +24,7 @@ typedef struct _reader {
         VALUE       io;
         const char *in_str;
     };
-} * Reader;
+} *Reader;
 
 extern void oj_reader_init(Reader reader, VALUE io, int fd, bool to_s);
 extern int  oj_reader_read(Reader reader);
@@ -114,7 +116,7 @@ static inline int reader_expect(Reader reader, const char *s) {
 
 static inline void reader_cleanup(Reader reader) {
     if (reader->free_head && 0 != reader->head) {
-        xfree((char *)reader->head);
+        OJ_R_FREE((char *)reader->head);
         reader->head      = 0;
         reader->free_head = 0;
     }

data/ext/oj/resolve.c

@@ -27,12 +27,11 @@ inline static VALUE resolve_classname(VALUE mod, const char *classname, int auto
     return clas;
 }
 
-static VALUE
-resolve_classpath(ParseInfo pi, const char *name, size_t len, int auto_define, VALUE error_class) {
+static VALUE resolve_classpath(ParseInfo pi, const char *name, size_t len, int auto_define, VALUE error_class) {
     char        class_name[1024];
     VALUE       clas;
-    char *      end = class_name + sizeof(class_name) - 1;
-    char *      s;
+    char       *end = class_name + sizeof(class_name) - 1;
+    char       *s;
     const char *n = name;
 
     clas = rb_cObject;

data/ext/oj/rxclass.c

@@ -10,6 +10,7 @@
 #include <regex.h>
 #endif
 
+#include "mem.h"
 #include "rxclass.h"
 
 typedef struct _rxC {
@@ -20,7 +21,7 @@ typedef struct _rxC {
 #endif
     VALUE clas;
     char  src[256];
-} * RxC;
+} *RxC;
 
 void oj_rxclass_init(RxClass rc) {
     *rc->err = '\0';
@@ -37,13 +38,13 @@ void oj_rxclass_cleanup(RxClass rc) {
         if (Qnil == rxc->rrx) {
             regfree(&rxc->rx);
         }
-        xfree(rxc);
+        OJ_R_FREE(rxc);
 #endif
     }
 }
 
 void oj_rxclass_rappend(RxClass rc, VALUE rx, VALUE clas) {
-    RxC rxc = ALLOC_N(struct _rxC, 1);
+    RxC rxc = OJ_R_ALLOC_N(struct _rxC, 1);
 
     memset(rxc, 0, sizeof(struct _rxC));
     rxc->rrx  = rx;
@@ -70,7 +71,7 @@ int oj_rxclass_append(RxClass rc, const char *expr, VALUE clas) {
                  (unsigned long)sizeof(rxc->src));
         return EINVAL;
     }
-    rxc       = ALLOC_N(struct _rxC, 1);
+    rxc       = OJ_R_ALLOC_N(struct _rxC, 1);
     rxc->next = 0;
     rxc->clas = clas;
 
@@ -80,7 +81,7 @@ int oj_rxclass_append(RxClass rc, const char *expr, VALUE clas) {
     rxc->rrx = Qnil;
     if (0 != (err = regcomp(&rxc->rx, expr, flags))) {
         regerror(err, &rxc->rx, rc->err, sizeof(rc->err));
-        free(rxc);
+        OJ_FREE(rxc);
         return err;
     }
 #endif

data/ext/oj/rxclass.h

@@ -14,7 +14,7 @@ typedef struct _rxClass {
     struct _rxC *head;
     struct _rxC *tail;
     char         err[128];
-} * RxClass;
+} *RxClass;
 
 extern void  oj_rxclass_init(RxClass rc);
 extern void  oj_rxclass_cleanup(RxClass rc);

data/ext/oj/saj.c

@@ -15,6 +15,7 @@
 #define OJ_INFINITY (1.0 / 0.0)
 
 #include "encode.h"
+#include "mem.h"
 #include "oj.h"
 
 typedef struct _parseInfo {
@@ -28,7 +29,7 @@ typedef struct _parseInfo {
     int   has_array_end;
     int   has_add_value;
     int   has_error;
-} * ParseInfo;
+} *ParseInfo;
 
 static void  read_next(ParseInfo pi, const char *key);
 static void  read_hash(ParseInfo pi, const char *key);
@@ -577,7 +578,7 @@ static void saj_parse(VALUE handler, char *json) {
     /* initialize parse info */
     pi.str = json;
     pi.s   = json;
-#if IS_WINDOWS
+#if IS_WINDOWS || !defined(HAVE_GETRLIMIT)
     pi.stack_min = (void *)((char *)&obj - (512L * 1024L)); /* assume a 1M stack and give half to ruby */
 #else
     {
@@ -631,7 +632,7 @@ oj_saj_parse(int argc, VALUE *argv, VALUE self) {
     if (rb_type(input) == T_STRING) {
         // the json string gets modified so make a copy of it
         len  = RSTRING_LEN(input) + 1;
-        json = ALLOC_N(char, len);
+        json = OJ_R_ALLOC_N(char, len);
         strcpy(json, StringValuePtr(input));
     } else {
         VALUE          clas = rb_obj_class(input);
@@ -640,8 +641,8 @@ oj_saj_parse(int argc, VALUE *argv, VALUE self) {
         if (oj_stringio_class == clas) {
             s    = rb_funcall2(input, oj_string_id, 0, 0);
             len  = RSTRING_LEN(s) + 1;
-            json = ALLOC_N(char, len);
-            strcpy(json, rb_string_value_cstr((VALUE *)&s));
+            json = OJ_R_ALLOC_N(char, len);
+            strcpy(json, StringValueCStr(s));
 #if !IS_WINDOWS
         } else if (rb_cFile == clas && 0 == FIX2INT(rb_funcall(input, oj_pos_id, 0))) {
             int     fd = FIX2INT(rb_funcall(input, oj_fileno_id, 0));
@@ -649,7 +650,7 @@ oj_saj_parse(int argc, VALUE *argv, VALUE self) {
 
             len = lseek(fd, 0, SEEK_END);
             lseek(fd, 0, SEEK_SET);
-            json = ALLOC_N(char, len + 1);
+            json = OJ_R_ALLOC_N(char, len + 1);
             if (0 >= (cnt = read(fd, json, len)) || cnt != (ssize_t)len) {
                 rb_raise(rb_eIOError, "failed to read from IO Object.");
             }
@@ -658,14 +659,14 @@ oj_saj_parse(int argc, VALUE *argv, VALUE self) {
         } else if (rb_respond_to(input, oj_read_id)) {
             s    = rb_funcall2(input, oj_read_id, 0, 0);
             len  = RSTRING_LEN(s) + 1;
-            json = ALLOC_N(char, len);
-            strcpy(json, rb_string_value_cstr((VALUE *)&s));
+            json = OJ_R_ALLOC_N(char, len);
+            strcpy(json, StringValueCStr(s));
         } else {
             rb_raise(rb_eArgError, "saj_parse() expected a String or IO Object.");
         }
     }
     saj_parse(*argv, json);
-    xfree(json);
+    OJ_R_FREE(json);
 
     return Qnil;
 }