oj 3.7.4 → 3.11.2

data/ext/oj/rails.h

@@ -1,10 +1,7 @@
-/* rails.h
- * Copyright (c) 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2017 Peter Ohler. All rights reserved.
 
-#ifndef __OJ_RAILS_H__
-#define __OJ_RAILS_H__
+#ifndef OJ_RAILS_H
+#define OJ_RAILS_H
 
 #include "dump.h"
 
@@ -18,4 +15,4 @@ extern bool	oj_rails_float_opt;
 extern VALUE	oj_optimize_rails(VALUE self);
 
 
-#endif /* __OJ_RAILS_H__ */
+#endif /* OJ_RAILS_H */

data/ext/oj/reader.c

@@ -1,7 +1,4 @@
-/* reader.c
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
 #include <stdlib.h>
 #include <errno.h>
@@ -9,7 +6,7 @@
 #include <strings.h>
 #include <sys/types.h>
 #if NEEDS_UIO
-#include <sys/uio.h>	
+#include <sys/uio.h>
 #endif
 #include <unistd.h>
 #include <time.h>
@@ -78,13 +75,13 @@ oj_reader_init(Reader reader, VALUE io, int fd, bool to_s) {
 	reader->io = io;
     } else if (to_s) {
 	volatile VALUE	rstr = rb_funcall(io, oj_to_s_id, 0);
-	
+
 	reader->read_func = 0;
 	reader->in_str = StringValuePtr(rstr);
 	reader->head = (char*)reader->in_str;
 	reader->tail = reader->head;
 	reader->read_end = reader->head + RSTRING_LEN(rstr);
-    } else {	
+    } else {
 	rb_raise(rb_eArgError, "parser io argument must be a String or respond to readpartial() or read().\n");
     }
 }
@@ -107,7 +104,7 @@ oj_reader_read(Reader reader) {
 	if (0 >= shift) { /* no space left so allocate more */
 	    const char	*old = reader->head;
 	    size_t	size = reader->end - reader->head + BUF_PAD;
-	
+
 	    if (reader->head == reader->base) {
 		reader->head = ALLOC_N(char, size * 2);
 		memcpy((char*)reader->head, old, size);

data/ext/oj/reader.h

@@ -1,12 +1,9 @@
-/* reader.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
-#ifndef __OJ_READER_H__
-#define __OJ_READER_H__
+#ifndef OJ_READER_H
+#define OJ_READER_H
 
-typedef struct _Reader {
+typedef struct _reader {
     char	base[0x00001000];
     char	*head;
     char	*end;
@@ -18,7 +15,7 @@ typedef struct _Reader {
     int		line;
     int		col;
     int		free_head;
-    int		(*read_func)(struct _Reader *reader);
+    int		(*read_func)(struct _reader *reader);
     union {
 	int		fd;
 	VALUE		io;
@@ -43,7 +40,7 @@ reader_get(Reader reader) {
     }
     reader->col++;
     reader->pos++;
-    
+
     return *reader->tail++;
 }
 
@@ -148,4 +145,4 @@ is_white(char c) {
     return 0;
 }
 
-#endif /* __OJ_READER_H__ */
+#endif /* OJ_READER_H */

data/ext/oj/resolve.c

@@ -1,12 +1,9 @@
-/* resolve.c
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 #include <pthread.h>
 #endif
 
@@ -75,7 +72,7 @@ oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define, VALUE
     if (No == pi->options.class_cache) {
 	return resolve_classpath(pi, name, len, auto_define, error_class);
     }
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_lock(&oj_cache_mutex);
 #else
     rb_mutex_lock(oj_cache_mutex);
@@ -85,7 +82,7 @@ oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define, VALUE
 	    *slot = clas;
 	}
     }
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_unlock(&oj_cache_mutex);
 #else
     rb_mutex_unlock(oj_cache_mutex);

data/ext/oj/resolve.h

@@ -1,14 +1,11 @@
-/* resolve.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
-#ifndef __OJ_RESOLVE_H__
-#define __OJ_RESOLVE_H__
+#ifndef OJ_RESOLVE_H
+#define OJ_RESOLVE_H
 
 #include "ruby.h"
 
 extern VALUE	oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define, VALUE error_class);
 extern VALUE	oj_name2struct(ParseInfo pi, VALUE nameVal, VALUE error_class);
 
-#endif /* __OJ_RESOLVE_H__ */
+#endif /* OJ_RESOLVE_H */

data/ext/oj/rxclass.c

@@ -1,7 +1,4 @@
-/* rxclass.c
- * Copyright (c) 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2017 Peter Ohler. All rights reserved.
 
 #include <sys/types.h>
 #include <stdlib.h>
@@ -14,8 +11,8 @@
 
 #include "rxclass.h"
 
-typedef struct _RxC {
-    struct _RxC	*next;
+typedef struct _rxC {
+    struct _rxC	*next;
     VALUE	rrx;
 #if !IS_WINDOWS
     regex_t	rx;
@@ -48,9 +45,9 @@ oj_rxclass_cleanup(RxClass rc) {
 
 void
 oj_rxclass_rappend(RxClass rc, VALUE rx, VALUE clas) {
-    RxC	rxc = ALLOC_N(struct _RxC, 1);
+    RxC	rxc = ALLOC_N(struct _rxC, 1);
 
-    memset(rxc, 0, sizeof(struct _RxC));
+    memset(rxc, 0, sizeof(struct _rxC));
     rxc->rrx = rx;
     rxc->clas = clas;
     if (NULL == rc->tail) {
@@ -73,7 +70,7 @@ oj_rxclass_append(RxClass rc, const char *expr, VALUE clas) {
 	snprintf(rc->err, sizeof(rc->err), "expressions must be less than %lu characters", (unsigned long)sizeof(rxc->src));
 	return EINVAL;
     }
-    rxc = ALLOC_N(struct _RxC, 1);
+    rxc = ALLOC_N(struct _rxC, 1);
     rxc->next = 0;
     rxc->clas = clas;
 
@@ -101,12 +98,12 @@ VALUE
 oj_rxclass_match(RxClass rc, const char *str, int len) {
     RxC		rxc;
     char	buf[4096];
-    
+
     for (rxc = rc->head; NULL != rxc; rxc = rxc->next) {
 	if (Qnil != rxc->rrx) {
 	    // Must use a valiabel for this to work.
 	    volatile VALUE	rstr = rb_str_new(str, len);
-	    
+
 	    //if (Qtrue == rb_funcall(rxc->rrx, rb_intern("match?"), 1, rstr)) {
 	    if (Qnil != rb_funcall(rxc->rrx, rb_intern("match"), 1, rstr)) {
 		return rxc->clas;

data/ext/oj/rxclass.h

@@ -1,19 +1,16 @@
-/* rxclass.h
- * Copyright (c) 2017, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2017 Peter Ohler. All rights reserved.
 
-#ifndef __OJ_RXCLASS_H__
-#define __OJ_RXCLASS_H__
+#ifndef OJ_RXCLASS_H
+#define OJ_RXCLASS_H
 
 #include <stdbool.h>
 #include "ruby.h"
 
-struct _RxC;
+struct _rxC;
 
-typedef struct _RxClass {
-    struct _RxC	*head;
-    struct _RxC	*tail;
+typedef struct _rxClass {
+    struct _rxC	*head;
+    struct _rxC	*tail;
     char	err[128];
 } *RxClass;
 
@@ -24,4 +21,4 @@ extern VALUE	oj_rxclass_match(RxClass rc, const char *str, int len);
 extern void	oj_rxclass_copy(RxClass src, RxClass dest);
 extern void	oj_rxclass_rappend(RxClass rc, VALUE rx, VALUE clas);
 
-#endif /* __OJ_RXCLASS_H__ */
+#endif /* OJ_RXCLASS_H */

data/ext/oj/saj.c

@@ -1,7 +1,4 @@
-/* saj.c
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
 
 #if !IS_WINDOWS
 #include <sys/resource.h>  /* for getrlimit() on linux */
@@ -19,7 +16,7 @@
 #include "oj.h"
 #include "encode.h"
 
-typedef struct _ParseInfo {
+typedef struct _parseInfo {
     char	*str;		/* buffer being read from */
     char	*s;		/* current position in buffer */
     void	*stack_min;
@@ -213,7 +210,7 @@ read_next(ParseInfo pi, const char *key) {
 static void
 read_hash(ParseInfo pi, const char *key) {
     const char	*ks;
-    
+
     if (pi->has_hash_start) {
 	call_no_value(pi->handler, oj_hash_start_id, key);
     }
@@ -378,7 +375,7 @@ read_num(ParseInfo pi, const char *key) {
     if (0 == e && 0 == a && 1 == div) {
 	if (big) {
 	    char	c = *pi->s;
-	
+
 	    *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);
@@ -396,7 +393,7 @@ read_num(ParseInfo pi, const char *key) {
     } else { /* decimal */
 	if (big) {
 	    char	c = *pi->s;
-	
+
 	    *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);
@@ -541,7 +538,7 @@ read_quoted_value(ParseInfo pi) {
     char	*h = pi->s; /* head */
     char	*t = h;	    /* tail */
     uint32_t	code;
-    
+
     h++;	/* skip quote character */
     t++;
     value = h;
@@ -605,7 +602,7 @@ read_quoted_value(ParseInfo pi) {
 static void
 saj_parse(VALUE handler, char *json) {
     volatile VALUE	obj = Qnil;
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
 
     if (0 == json) {
 	if (pi.has_error) {
@@ -626,7 +623,7 @@ saj_parse(VALUE handler, char *json) {
     {
 	struct rlimit	lim;
 
-	if (0 == getrlimit(RLIMIT_STACK, &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 */
 	} else {
 	    pi.stack_min = 0; /* indicates not to check stack limit */
@@ -679,7 +676,7 @@ oj_saj_parse(int argc, VALUE *argv, VALUE self) {
     } else {
 	VALUE		clas = rb_obj_class(input);
 	volatile VALUE	s;
-	
+
 	if (oj_stringio_class == clas) {
 	    s = rb_funcall2(input, oj_string_id, 0, 0);
 	    len = RSTRING_LEN(s) + 1;

data/ext/oj/scp.c

@@ -1,7 +1,4 @@
-/* scp.c
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -36,7 +33,7 @@ noop_add_num(ParseInfo pi, NumInfo ni) {
 }
 
 static VALUE
-noop_hash_key(struct _ParseInfo *pi, const char *key, size_t klen) {
+noop_hash_key(ParseInfo pi, const char *key, size_t klen) {
     return Qundef;
 }
 
@@ -117,7 +114,7 @@ calc_hash_key(ParseInfo pi, Val kval) {
 }
 
 static VALUE
-hash_key(struct _ParseInfo *pi, const char *key, size_t klen) {
+hash_key(ParseInfo pi, const char *key, size_t klen) {
     return rb_funcall(pi->handler, oj_hash_key_id, 1, rb_str_new(key, klen));
 }
 
@@ -159,7 +156,7 @@ array_append_value(ParseInfo pi, VALUE value) {
 
 VALUE
 oj_sc_parse(int argc, VALUE *argv, VALUE self) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
     VALUE		input = argv[1];
 
     parse_info_init(&pi);

data/ext/oj/sparse.c

@@ -1,7 +1,4 @@
-/* sparse.c
- * Copyright (c) 2013, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2013 Peter Ohler. All rights reserved.
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -203,7 +200,7 @@ unicode_to_chars(ParseInfo pi, Buf buf, uint32_t code) {
 // entered at backslash
 static void
 read_escaped_str(ParseInfo pi) {
-    struct _Buf	buf;
+    struct _buf	buf;
     char	c;
     uint32_t	code;
     Val		parent = stack_peek(&pi->stack);
@@ -228,17 +225,6 @@ read_escaped_str(ParseInfo pi) {
 	    case '"':	buf_append(&buf, '"');	break;
 	    case '/':	buf_append(&buf, '/');	break;
 	    case '\\':	buf_append(&buf, '\\');	break;
-	    case '\'':
-		// The json gem claims this is not an error despite the
-		// ECMA-404 indicating it is not valid.
-		if (CompatMode == pi->options.mode) {
-		    buf_append(&buf, '\'');
-		} else {
-		    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid escaped character");
-		    buf_cleanup(&buf);
-		    return;
-		}
-		break;
 	    case 'u':
 		if (0 == (code = read_hex(pi)) && err_has(&pi->err)) {
 		    buf_cleanup(&buf);
@@ -276,6 +262,12 @@ read_escaped_str(ParseInfo pi) {
 		}
 		break;
 	    default:
+		// The json gem claims this is not an error despite the
+		// ECMA-404 indicating it is not valid.
+		if (CompatMode == pi->options.mode) {
+		    buf_append(&buf, c);
+		    break;
+		}
 		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid escaped character");
 		buf_cleanup(&buf);
 		return;
@@ -393,7 +385,7 @@ read_str(ParseInfo pi) {
 
 static void
 read_num(ParseInfo pi) {
-    struct _NumInfo	ni;
+    struct _numInfo	ni;
     char		c;
 
     reader_protect(&pi->rd);
@@ -407,8 +399,15 @@ read_num(ParseInfo pi) {
     ni.infinity = 0;
     ni.nan = 0;
     ni.neg = 0;
-    ni.hasExp = 0;
-    ni.no_big = (FloatDec == pi->options.bigdec_load);
+    ni.has_exp = 0;
+    if (CompatMode == pi->options.mode) {
+	ni.no_big = !pi->options.compat_bigdec;
+	ni.bigdec_load = pi->options.compat_bigdec;
+    } else {
+	ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load || RubyDec == pi->options.bigdec_load);
+	ni.bigdec_load = pi->options.bigdec_load;
+    }
+
     c = reader_get(&pi->rd);
     if ('-' == c) {
 	c = reader_get(&pi->rd);
@@ -469,18 +468,26 @@ read_num(ParseInfo pi) {
 		if (0 < ni.num || 0 < ni.i) {
 		    dec_cnt++;
 		}
-		ni.num = ni.num * 10 + d;
-		ni.div *= 10;
-		ni.di++;
-		if (INT64_MAX <= ni.div || DEC_MAX < dec_cnt) {
-		    ni.big = 1;
+		if (INT64_MAX <= ni.div) {
+		    if (!ni.no_big) {
+			ni.big = true;
+		    }
+		} else {
+		    ni.num = ni.num * 10 + d;
+		    ni.div *= 10;
+		    ni.di++;
+		    if (INT64_MAX <= ni.div || DEC_MAX < dec_cnt) {
+			if (!ni.no_big) {
+			    ni.big = true;
+			}
+		    }
 		}
 	    }
 	}
 	if ('e' == c || 'E' == c) {
 	    int	eneg = 0;
 
-	    ni.hasExp = 1;
+	    ni.has_exp = 1;
 	    c = reader_get(&pi->rd);
 	    if ('-' == c) {
 		c = reader_get(&pi->rd);
@@ -516,7 +523,11 @@ read_num(ParseInfo pi) {
 	    ni.nan = 1;
 	}
     }
-    if (BigDec == pi->options.bigdec_load) {
+    if (CompatMode == pi->options.mode) {
+	if (pi->options.compat_bigdec) {
+	    ni.big = 1;
+	}
+    } else if (BigDec == pi->options.bigdec_load) {
 	ni.big = 1;
     }
     add_num_value(pi, &ni);
@@ -525,7 +536,7 @@ read_num(ParseInfo pi) {
 
 static void
 read_nan(ParseInfo pi) {
-    struct _NumInfo	ni;
+    struct _numInfo	ni;
     char		c;
 
     ni.str = pi->rd.str;
@@ -539,14 +550,24 @@ read_nan(ParseInfo pi) {
     ni.infinity = 0;
     ni.nan = 1;
     ni.neg = 0;
-    ni.no_big = (FloatDec == pi->options.bigdec_load);
+    if (CompatMode == pi->options.mode) {
+	ni.no_big = !pi->options.compat_bigdec;
+	ni.bigdec_load = pi->options.compat_bigdec;
+    } else {
+	ni.no_big = (FloatDec == pi->options.bigdec_load || FastDec == pi->options.bigdec_load || RubyDec == pi->options.bigdec_load);
+	ni.bigdec_load = pi->options.bigdec_load;
+    }
 
     if ('a' != reader_get(&pi->rd) ||
 	('N' != (c = reader_get(&pi->rd)) && 'n' != c)) {
 	oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "not a number or other value");
 	return;
     }
-    if (BigDec == pi->options.bigdec_load) {
+    if (CompatMode == pi->options.mode) {
+	if (pi->options.compat_bigdec) {
+	    ni.big = 1;
+	}
+    } else if (BigDec == pi->options.bigdec_load) {
 	ni.big = 1;
     }
     add_num_value(pi, &ni);
@@ -632,7 +653,7 @@ oj_sparse2(ParseInfo pi) {
     while (1) {
 	if (0 < pi->max_depth && pi->max_depth <= pi->stack.tail - pi->stack.head - 1) {
 	    VALUE	err_clas = oj_get_json_err_class("NestingError");
-	    
+
 	    oj_set_error_at(pi, err_clas, __FILE__, __LINE__, "Too deeply nested.");
 	    pi->err_class = err_clas;
 	    return;
@@ -718,7 +739,7 @@ oj_sparse2(ParseInfo pi) {
 		    return;
 		}
 	    } else if ('a' == c) {
-		struct _NumInfo	ni;
+		struct _numInfo	ni;
 
 		c = reader_get(&pi->rd);
 		if ('N' != c && 'n' != c) {
@@ -736,7 +757,15 @@ oj_sparse2(ParseInfo pi) {
 		ni.infinity = 0;
 		ni.nan = 1;
 		ni.neg = 0;
-		ni.no_big = (FloatDec == pi->options.bigdec_load);
+		if (CompatMode == pi->options.mode) {
+		    ni.no_big = !pi->options.compat_bigdec;
+		    ni.bigdec_load = pi->options.compat_bigdec;
+		} else {
+		    ni.no_big = (FloatDec == pi->options.bigdec_load ||
+				 FastDec == pi->options.bigdec_load ||
+				 RubyDec == pi->options.bigdec_load);
+		    ni.bigdec_load = pi->options.bigdec_load;
+		}
 		add_num_value(pi, &ni);
 	    } else {
 		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid token");
@@ -773,6 +802,7 @@ oj_sparse2(ParseInfo pi) {
 		first = 0;
 	    }
 	    start = pi->rd.pos;
+	    // TBD break if option set to allow that
 	}
     }
 }
@@ -890,7 +920,7 @@ CLEANUP:
 	if (Qnil != pi->err_class && 0 != pi->err_class) {
 	    pi->err.clas = pi->err_class;
 	}
-	if (CompatMode == pi->options.mode) {
+	if (CompatMode == pi->options.mode && Yes != pi->options.safe) {
 	    // The json gem requires the error message be UTF-8 encoded. In
 	    // additional the complete JSON source should be returned but that
 	    // is not possible without stored all the bytes read and reading
@@ -898,6 +928,10 @@ CLEANUP:
 	    // idea.
 	    VALUE	args[] = { oj_encode(rb_str_new2(pi->err.msg)) };
 
+	    if (pi->err.clas == oj_parse_error_class) {
+		// The error was an Oj::ParseError so change to a JSON::ParserError.
+		pi->err.clas = oj_json_parser_error_class;
+	    }
 	    rb_exc_raise(rb_class_new_instance(1, args, pi->err.clas));
 	} else {
 	    oj_err_raise(&pi->err);