oj 3.11.5 → 3.16.5

data/ext/oj/rails.h

@@ -6,7 +6,7 @@
 
 #include "dump.h"
 
-extern void oj_mimic_rails_init();
+extern void oj_mimic_rails_init(void);
 extern ROpt oj_rails_get_opt(ROptTable rot, VALUE clas);
 
 extern bool oj_rails_hash_opt;

data/ext/oj/reader.c

@@ -6,12 +6,15 @@
 #include <stdlib.h>
 #include <strings.h>
 #include <sys/types.h>
+#ifdef NEEDS_UIO
 #if NEEDS_UIO
 #include <sys/uio.h>
 #endif
+#endif
 #include <time.h>
 #include <unistd.h>
 
+#include "mem.h"
 #include "oj.h"
 #include "reader.h"
 #include "ruby.h"
@@ -61,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));
@@ -73,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);
@@ -81,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");
     }
 }
 
@@ -105,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;
@@ -121,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) {
@@ -155,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);
@@ -165,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;
 
@@ -176,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);
@@ -186,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

@@ -9,7 +9,7 @@
 #endif
 
 #include "err.h"
-#include "hash.h"
+#include "intern.h"
 #include "oj.h"
 #include "parse.h"
 
@@ -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;
@@ -66,28 +65,10 @@ resolve_classpath(ParseInfo pi, const char *name, size_t len, int auto_define, V
 
 VALUE
 oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define, VALUE error_class) {
-    VALUE  clas;
-    VALUE *slot;
-
     if (No == pi->options.class_cache) {
         return resolve_classpath(pi, name, len, auto_define, error_class);
     }
-#ifdef HAVE_PTHREAD_MUTEX_INIT
-    pthread_mutex_lock(&oj_cache_mutex);
-#else
-    rb_mutex_lock(oj_cache_mutex);
-#endif
-    if (Qnil == (clas = oj_class_hash_get(name, len, &slot))) {
-        if (Qundef != (clas = resolve_classpath(pi, name, len, auto_define, error_class))) {
-            *slot = clas;
-        }
-    }
-#ifdef HAVE_PTHREAD_MUTEX_INIT
-    pthread_mutex_unlock(&oj_cache_mutex);
-#else
-    rb_mutex_unlock(oj_cache_mutex);
-#endif
-    return clas;
+    return oj_class_intern(name, len, true, pi, auto_define, error_class);
 }
 
 VALUE

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
@@ -110,7 +111,7 @@ oj_rxclass_match(RxClass rc, const char *str, int len) {
             }
         } else if (len < (int)sizeof(buf)) {
 #if !IS_WINDOWS
-            // string is not \0 terminated so copy and atempt a match
+            // string is not \0 terminated so copy and attempt a match
             memcpy(buf, str, len);
             buf[len] = '\0';
             if (0 == regexec(&rxc->rx, buf, 0, NULL, 0)) {  // match

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);
@@ -210,10 +211,7 @@ static void read_hash(ParseInfo pi, const char *key) {
                 pi->s++;
             } else {
                 if (pi->has_error) {
-                    call_error("invalid format, expected , or } while in an object",
-                               pi,
-                               __FILE__,
-                               __LINE__);
+                    call_error("invalid format, expected , or } while in an object", pi, __FILE__, __LINE__);
                 }
                 raise_error("invalid format, expected , or } while in an object", pi->str, pi->s);
             }
@@ -243,10 +241,7 @@ static void read_array(ParseInfo pi, const char *key) {
                 break;
             } else {
                 if (pi->has_error) {
-                    call_error("invalid format, expected , or ] while in an array",
-                               pi,
-                               __FILE__,
-                               __LINE__);
+                    call_error("invalid format, expected , or ] while in an array", pi, __FILE__, __LINE__);
                 }
                 raise_error("invalid format, expected , or ] while in an array", pi->str, pi->s);
             }
@@ -276,7 +271,7 @@ static void read_str(ParseInfo pi, const char *key) {
 #endif
 
 static void read_num(ParseInfo pi, const char *key) {
-    char *  start = pi->s;
+    char   *start = pi->s;
     int64_t n     = 0;
     long    a     = 0;
     long    div   = 1;
@@ -351,9 +346,7 @@ static void read_num(ParseInfo pi, const char *key) {
 
             *pi->s = '\0';
             if (pi->has_add_value) {
-                call_add_value(pi->handler,
-                               rb_funcall(rb_cObject, oj_bigdecimal_id, 1, rb_str_new2(start)),
-                               key);
+                call_add_value(pi->handler, rb_funcall(rb_cObject, oj_bigdecimal_id, 1, rb_str_new2(start)), key);
             }
             *pi->s = c;
         } else {
@@ -371,9 +364,7 @@ static void read_num(ParseInfo pi, const char *key) {
 
             *pi->s = '\0';
             if (pi->has_add_value) {
-                call_add_value(pi->handler,
-                               rb_funcall(rb_cObject, oj_bigdecimal_id, 1, rb_str_new2(start)),
-                               key);
+                call_add_value(pi->handler, rb_funcall(rb_cObject, oj_bigdecimal_id, 1, rb_str_new2(start)), key);
             }
             *pi->s = c;
         } else {
@@ -505,9 +496,9 @@ static char *unicode_to_chars(ParseInfo pi, char *t, uint32_t code) {
  * reached again. Do not read the character after the terminating quote.
  */
 static char *read_quoted_value(ParseInfo pi) {
-    char *   value = 0;
-    char *   h     = pi->s; /* head */
-    char *   t     = h;     /* tail */
+    char    *value = 0;
+    char    *h     = pi->s; /* head */
+    char    *t     = h;     /* tail */
     uint32_t code;
 
     h++; /* skip quote character */
@@ -587,16 +578,14 @@ static void saj_parse(VALUE handler, char *json) {
     /* initialize parse info */
     pi.str = json;
     pi.s   = json;
-#if IS_WINDOWS
-    pi.stack_min = (void *)((char *)&obj -
-                            (512 * 1024)); /* assume a 1M stack and give half to ruby */
+#if IS_WINDOWS || !defined(HAVE_GETRLIMIT)
+    pi.stack_min = (void *)((char *)&obj - (512L * 1024L)); /* assume a 1M stack and give half to ruby */
 #else
     {
         struct rlimit lim;
 
         if (0 == getrlimit(RLIMIT_STACK, &lim) && RLIM_INFINITY != lim.rlim_cur) {
-            pi.stack_min = (void *)((char *)&obj - (lim.rlim_cur / 4 *
-                                                    3)); /* let 3/4ths of the stack be used only */
+            pi.stack_min = (void *)((char *)&obj - (lim.rlim_cur / 4 * 3)); /* let 3/4ths of the stack be used only */
         } else {
             pi.stack_min = 0; /* indicates not to check stack limit */
         }
@@ -628,12 +617,12 @@ static void saj_parse(VALUE handler, char *json) {
  * @param [IO|String] io IO Object to read from
  * @deprecated The sc_parse() method along with the ScHandler is the preferred
  * callback parser. It is slightly faster and handles streams while the
- * saj_parse() methos requires a complete read before parsing.
+ * saj_parse() method requires a complete read before parsing.
  * @see sc_parse
  */
 VALUE
 oj_saj_parse(int argc, VALUE *argv, VALUE self) {
-    char * json  = 0;
+    char  *json  = 0;
     size_t len   = 0;
     VALUE  input = argv[1];
 
@@ -643,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);
@@ -652,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));
@@ -661,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.");
             }
@@ -670,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;
 }