oj 3.7.7 → 3.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 389ece68dade91713fa132445f6b5d7cefdef5b6e7787a8b66f530c13173271c
-  data.tar.gz: 49d899629ebbb41cb5b545400262f1644b93140c62b57f7f8c7ef98200ad2bb9
+  metadata.gz: 5008cd86952b184d31350d5e84256ca433e3dafe672c04400cd8d74bbc6190f4
+  data.tar.gz: 620b94ba6107477d17eda4d2f3558f1aa98d3c6635bdbb16443ba2b5868aeb57
 SHA512:
-  metadata.gz: 15c6bd0b3324687ef248e2f67270bab76b1c70da8e92b54dc474082ae717d601142a745a7e365b3ffdf82c1b6fbb12d72cdb7db3cdefb34a50b3eaf28c941786
-  data.tar.gz: 28fa1bb71e89c195ccb840d6c4b639ffc5c2244eba48aa69aab07cc76757b954ddffbe83801eb6624745ab21c73e5493c4858cbcbfa630f6a3df2a5a2d3899b8
+  metadata.gz: c1641f5af216aab8948c70c5c0e75f6f9fc6db9de5eca5cafad65b7fc6b877cded31bbf9f5b0fdb438217bfeae7c04cb880ec1b560771e0b341a0f1292f3c1e3
+  data.tar.gz: 1e3a1f8ee9b47fb8004cc53992ae68e5cceb055a53daecc73771ebccf3d3edcefeaac70e58f740279482e49eca89f32d38866a3412d67efdb9738f4e80c8c2e2

data/ext/oj/custom.c

@@ -3,6 +3,7 @@
  * All rights reserved.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 
 #include "code.h"
@@ -15,6 +16,7 @@
 #include "parse.h"
 #include "resolve.h"
 #include "trace.h"
+#include "util.h"
 
 extern void	oj_set_obj_ivar(Val parent, Val kval, VALUE value);
 extern VALUE	oj_parse_xml_time(const char *str, int len); // from object.c
@@ -1058,16 +1060,18 @@ hash_set_num(struct _parseInfo *pi, Val kval, NumInfo ni) {
 		// match the expected value.
 		parent->val = rb_funcall2(parent->val, oj_utc_id, 0, 0);
 	    } else if (ni->hasExp) {
-		time_t	t = (time_t)(ni->i + ni->exp);
-		struct tm	*st = gmtime(&t);
-		VALUE	args[8];
-
-		args[0] = LONG2NUM(1900 + st->tm_year);
-		args[1] = LONG2NUM(1 + st->tm_mon);
-		args[2] = LONG2NUM(st->tm_mday);
-		args[3] = LONG2NUM(st->tm_hour);
-		args[4] = LONG2NUM(st->tm_min);
-		args[5] = rb_float_new((double)st->tm_sec + ((double)nsec + 0.5) / 1000000000.0);
+		int64_t			t = (int64_t)(ni->i + ni->exp);
+		struct _timeInfo	ti;
+		VALUE			args[8];
+
+		sec_as_time(t, &ti);
+
+		args[0] = LONG2NUM(ti.year);
+		args[1] = LONG2NUM(ti.mon);
+		args[2] = LONG2NUM(ti.day);
+		args[3] = LONG2NUM(ti.hour);
+		args[4] = LONG2NUM(ti.min);
+		args[5] = rb_float_new((double)ti.sec + ((double)nsec + 0.5) / 1000000000.0);
 		args[6] = LONG2NUM(ni->exp);
 		parent->val = rb_funcall2(rb_cTime, oj_new_id, 7, args);
 	    } else {

data/ext/oj/dump.c

@@ -3,22 +3,19 @@
  * All rights reserved.
  */
 
-#include <stdlib.h>
 #include <errno.h>
-#if !IS_WINDOWS
-#include <sys/time.h>
-#endif
-#include <time.h>
+#include <math.h>
+#include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <math.h>
 #include <unistd.h>
-#include <errno.h>
 
 #include "oj.h"
 #include "cache8.h"
 #include "dump.h"
 #include "odd.h"
+#include "util.h"
 
 // Workaround in case INFINITY is not defined in math.h or if the OS is CentOS
 #define OJ_INFINITY (1.0/0.0)
@@ -493,14 +490,14 @@ oj_dump_ruby_time(VALUE obj, Out out) {
 
 void
 oj_dump_xml_time(VALUE obj, Out out) {
-    char	buf[64];
-    struct tm	*tm;
-    long	one = 1000000000;
-    time_t	sec;
-    long long	nsec;
-    long	tzsecs = NUM2LONG(rb_funcall2(obj, oj_utc_offset_id, 0, 0));
-    int		tzhour, tzmin;
-    char	tzsign = '+';
+    char		buf[64];
+    struct _timeInfo	ti;
+    long		one = 1000000000;
+    int64_t		sec;
+    long long		nsec;
+    long		tzsecs = NUM2LONG(rb_funcall2(obj, oj_utc_offset_id, 0, 0));
+    int			tzhour, tzmin;
+    char		tzsign = '+';
 
 #ifdef HAVE_RB_TIME_TIMESPEC
     if (16 <= sizeof(struct timespec)) {
@@ -541,8 +538,7 @@ oj_dump_xml_time(VALUE obj, Out out) {
     // 2012-01-05T23:58:07.123456000+09:00
     //tm = localtime(&sec);
     sec += tzsecs;
-    tm = gmtime(&sec);
-#if 1
+    sec_as_time((int64_t)sec, &ti);
     if (0 > tzsecs) {
         tzsign = '-';
         tzhour = (int)(tzsecs / -3600);
@@ -551,26 +547,12 @@ oj_dump_xml_time(VALUE obj, Out out) {
         tzhour = (int)(tzsecs / 3600);
         tzmin = (int)(tzsecs / 60) - (tzhour * 60);
     }
-#else
-    if (0 > tm->tm_gmtoff) {
-        tzsign = '-';
-        tzhour = (int)(tm->tm_gmtoff / -3600);
-        tzmin = (int)(tm->tm_gmtoff / -60) - (tzhour * 60);
-    } else {
-        tzhour = (int)(tm->tm_gmtoff / 3600);
-        tzmin = (int)(tm->tm_gmtoff / 60) - (tzhour * 60);
-    }
-#endif
     if (0 == nsec || 0 == out->opts->sec_prec) {
 	if (0 == tzsecs && rb_funcall2(obj, oj_utcq_id, 0, 0)) {
-	    sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02dZ",
-		    tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-		    tm->tm_hour, tm->tm_min, tm->tm_sec);
+	    sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02dZ", ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec);
 	    oj_dump_cstr(buf, 20, 0, 0, out);
 	} else {
-	    sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d",
-		    tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-		    tm->tm_hour, tm->tm_min, tm->tm_sec,
+	    sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d", ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec,
 		    tzsign, tzhour, tzmin);
 	    oj_dump_cstr(buf, 25, 0, 0, out);
 	}
@@ -582,9 +564,7 @@ oj_dump_xml_time(VALUE obj, Out out) {
 	    format[32] = '0' + out->opts->sec_prec;
 	    len -= 9 - out->opts->sec_prec;
 	}
-	sprintf(buf, format,
-		tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-		tm->tm_hour, tm->tm_min, tm->tm_sec, (long)nsec);
+	sprintf(buf, format, ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec, (long)nsec);
 	oj_dump_cstr(buf, len, 0, 0, out);
     } else {
 	char	format[64] = "%04d-%02d-%02dT%02d:%02d:%02d.%09ld%c%02d:%02d";
@@ -594,10 +574,7 @@ oj_dump_xml_time(VALUE obj, Out out) {
 	    format[32] = '0' + out->opts->sec_prec;
 	    len -= 9 - out->opts->sec_prec;
 	}
-	sprintf(buf, format,
-		tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-		tm->tm_hour, tm->tm_min, tm->tm_sec, (long)nsec,
-		tzsign, tzhour, tzmin);
+	sprintf(buf, format, ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec, (long)nsec, tzsign, tzhour, tzmin);
 	oj_dump_cstr(buf, len, 0, 0, out);
     }
 }

data/ext/oj/fast.c

@@ -819,6 +819,8 @@ parse_json(VALUE clas, char *json, bool given, bool allocated) {
     int			ex = 0;
     volatile VALUE	self;
 
+    // TBD are both needed? is stack allocation ever needed?
+    
     if (given) {
 	doc = ALLOCA_N(struct _doc, 1);
     } else {
@@ -862,6 +864,7 @@ parse_json(VALUE clas, char *json, bool given, bool allocated) {
 	if (allocated && 0 != ex) { // will jump so caller will not free
 	    xfree(json);
 	}
+	rb_gc_enable();
     } else {
 	result = doc->self;
     }
@@ -1165,8 +1168,14 @@ doc_open(VALUE clas, VALUE str) {
     } else {
 	json = ALLOCA_N(char, len);
     }
+    // It should not be necessaary to stop GC but if it is not stopped and a
+    // large string is parsed that string is corrupted or freed during
+    // parsing. I'm not sure what is going on exactly but disabling GC avoids
+    // the issue.
+    rb_gc_disable();
     memcpy(json, StringValuePtr(str), len);
     obj = parse_json(clas, json, given, allocate);
+    rb_gc_enable();
     if (given && allocate) {
 	xfree(json);
     }
@@ -1222,7 +1231,9 @@ doc_open_file(VALUE clas, VALUE filename) {
     }
     fclose(f);
     json[len] = '\0';
+    rb_gc_disable();
     obj = parse_json(clas, json, given, allocate);
+    rb_gc_enable();
     if (given && allocate) {
 	xfree(json);
     }

data/ext/oj/object.c

@@ -3,6 +3,7 @@
  * All rights reserved.
  */
 
+#include <stdint.h>
 #include <stdio.h>
 #include <time.h>
 
@@ -14,6 +15,7 @@
 #include "odd.h"
 #include "encode.h"
 #include "trace.h"
+#include "util.h"
 
 inline static long
 read_long(const char *str, size_t len) {
@@ -291,24 +293,19 @@ hat_num(ParseInfo pi, Val parent, Val kval, NumInfo ni) {
 		    // match the expected value.
 		    parent->val = rb_funcall2(parent->val, oj_utc_id, 0, 0);
 		} else if (ni->hasExp) {
-		    time_t	t = (time_t)(ni->i + ni->exp);
-		    struct tm	*st = gmtime(&t);
-		    VALUE	args[8];
-
-		    // Windows does not support dates before 1970 so ignore
-		    // the zone and do the best we can.
-		    if (NULL == st) {
-			parent->val = rb_time_nano_new(ni->i, (long)nsec);
-		    } else {
-			args[0] = LONG2NUM((long)(1900 + st->tm_year));
-			args[1] = LONG2NUM(1 + st->tm_mon);
-			args[2] = LONG2NUM(st->tm_mday);
-			args[3] = LONG2NUM(st->tm_hour);
-			args[4] = LONG2NUM(st->tm_min);
-			args[5] = rb_float_new((double)st->tm_sec + ((double)nsec + 0.5) / 1000000000.0);
-			args[6] = LONG2NUM(ni->exp);
-			parent->val = rb_funcall2(rb_cTime, oj_new_id, 7, args);
-		    }
+		    int64_t		t = (int64_t)(ni->i + ni->exp);
+		    struct _timeInfo	ti;
+		    VALUE		args[8];
+
+		    sec_as_time(t, &ti);
+		    args[0] = LONG2NUM((long)(ti.year));
+		    args[1] = LONG2NUM(ti.mon);
+		    args[2] = LONG2NUM(ti.day);
+		    args[3] = LONG2NUM(ti.hour);
+		    args[4] = LONG2NUM(ti.min);
+		    args[5] = rb_float_new((double)ti.sec + ((double)nsec + 0.5) / 1000000000.0);
+		    args[6] = LONG2NUM(ni->exp);
+		    parent->val = rb_funcall2(rb_cTime, oj_new_id, 7, args);
 		} else {
 		    parent->val = rb_time_nano_new(ni->i, (long)nsec);
 		}
@@ -462,7 +459,7 @@ hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, const char *o
  WHICH_TYPE:
     switch (rb_type(parent->val)) {
     case T_NIL:
-	parent->odd_args = 0; // make sure it is 0 in case not odd
+	parent->odd_args = NULL; // make sure it is NULL in case not odd
 	if ('^' != *key || !hat_cstr(pi, parent, kval, str, len)) {
 	    parent->val = rb_hash_new();
 	    goto WHICH_TYPE;
@@ -484,7 +481,7 @@ hash_set_cstr(ParseInfo pi, Val kval, const char *str, size_t len, const char *o
 	oj_set_obj_ivar(parent, kval, rval);
 	break;
     case T_CLASS:
-	if (0 == parent->odd_args) {
+	if (NULL == parent->odd_args) {
 	    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "%s is not an odd class", rb_class2name(rb_obj_class(parent->val)));
 	    return;
 	} else {
@@ -520,7 +517,7 @@ hash_set_num(ParseInfo pi, Val kval, NumInfo ni) {
  WHICH_TYPE:
     switch (rb_type(parent->val)) {
     case T_NIL:
-	parent->odd_args = 0; // make sure it is 0 in case not odd
+	parent->odd_args = NULL; // make sure it is NULL in case not odd
 	if ('^' != *key || !hat_num(pi, parent, kval, ni)) {
 	    parent->val = rb_hash_new();
 	    goto WHICH_TYPE;
@@ -540,7 +537,7 @@ hash_set_num(ParseInfo pi, Val kval, NumInfo ni) {
 	}
 	break;
     case T_CLASS:
-	if (0 == parent->odd_args) {
+	if (NULL == parent->odd_args) {
 	    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "%s is not an odd class", rb_class2name(rb_obj_class(parent->val)));
 	    return;
 	} else {
@@ -575,7 +572,7 @@ hash_set_value(ParseInfo pi, Val kval, VALUE value) {
  WHICH_TYPE:
     switch (rb_type(parent->val)) {
     case T_NIL:
-	parent->odd_args = 0; // make sure it is 0 in case not odd
+	parent->odd_args = NULL; // make sure it is NULL in case not odd
 	if ('^' != *key || !hat_value(pi, parent, key, klen, value)) {
 	    parent->val = rb_hash_new();
 	    goto WHICH_TYPE;
@@ -616,7 +613,7 @@ hash_set_value(ParseInfo pi, Val kval, VALUE value) {
 	break;
     case T_MODULE:
     case T_CLASS:
-	if (0 == parent->odd_args) {
+	if (NULL == parent->odd_args) {
 	    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "%s is not an odd class", rb_class2name(rb_obj_class(parent->val)));
 	    return;
 	} else if (0 !=	oj_odd_set_arg(parent->odd_args, key, klen, value)) {
@@ -653,12 +650,12 @@ end_hash(ParseInfo pi) {
 
     if (Qnil == parent->val) {
 	parent->val = rb_hash_new();
-    } else if (0 != parent->odd_args) {
+    } else if (NULL != parent->odd_args) {
 	OddArgs	oa = parent->odd_args;
 
 	parent->val = rb_funcall2(oa->odd->create_obj, oa->odd->create_op, oa->odd->attr_cnt, oa->args);
 	oj_odd_free(oa);
-	parent->odd_args = 0;
+	parent->odd_args = NULL;
     }
     if (Yes == pi->options.trace) {
 	oj_trace_parse_hash_end(pi, __FILE__, __LINE__);

data/ext/oj/odd.c

@@ -38,11 +38,11 @@ set_class(Odd odd, const char *classname) {
 
 static VALUE
 get_datetime_secs(VALUE obj) {
-    VALUE	rsecs = rb_funcall(obj, sec_id, 0);
-    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));
+    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));
 
     num += sec * den;
 

data/ext/oj/rails.c

@@ -8,6 +8,7 @@
 #include "code.h"
 #include "encode.h"
 #include "trace.h"
+#include "util.h"
 
 #define OJ_INFINITY (1.0/0.0)
 
@@ -221,9 +222,9 @@ dump_bigdecimal(VALUE obj, int depth, Out out, bool as_ok) {
 }
 
 static void
-dump_sec_nano(VALUE obj, time_t sec, long nsec, Out out) {
+dump_sec_nano(VALUE obj, int64_t sec, long nsec, Out out) {
     char		buf[64];
-    struct tm		*tm;
+    struct _timeInfo	ti;
     long		one = 1000000000;
     long		tzsecs = NUM2LONG(rb_funcall2(obj, oj_utc_offset_id, 0, 0));
     int			tzhour, tzmin;
@@ -248,7 +249,7 @@ dump_sec_nano(VALUE obj, time_t sec, long nsec, Out out) {
     }
     // 2012-01-05T23:58:07.123456000+09:00 or 2012/01/05 23:58:07 +0900
     sec += tzsecs;
-    tm = gmtime(&sec);
+    sec_as_time(sec, &ti);
     if (0 > tzsecs) {
         tzsign = '-';
         tzhour = (int)(tzsecs / -3600);
@@ -258,19 +259,12 @@ dump_sec_nano(VALUE obj, time_t sec, long nsec, Out out) {
         tzmin = (int)(tzsecs / 60) - (tzhour * 60);
     }
     if (!xml_time) {
-	len = sprintf(buf, "%04d/%02d/%02d %02d:%02d:%02d %c%02d%02d",
-		      tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-		      tm->tm_hour, tm->tm_min, tm->tm_sec, tzsign, tzhour, tzmin);
+	len = sprintf(buf, "%04d/%02d/%02d %02d:%02d:%02d %c%02d%02d", ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec, tzsign, tzhour, 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",
-			  tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-			  tm->tm_hour, tm->tm_min, tm->tm_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",
-			  tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-			  tm->tm_hour, tm->tm_min, tm->tm_sec,
-			  tzsign, tzhour, tzmin);
+	    len = sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02d%c%02d:%02d", ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec, tzsign, tzhour, tzmin);
 	}
     } else if (0 == tzsecs && rb_funcall2(obj, oj_utcq_id, 0, 0)) {
 	char	format[64] = "%04d-%02d-%02dT%02d:%02d:%02d.%09ldZ";
@@ -280,9 +274,7 @@ dump_sec_nano(VALUE obj, time_t sec, long nsec, Out out) {
 	    format[32] = '0' + out->opts->sec_prec;
 	    len -= 9 - out->opts->sec_prec;
 	}
-	len = sprintf(buf, format,
-		      tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-		      tm->tm_hour, tm->tm_min, tm->tm_sec, nsec);
+	len = sprintf(buf, format, ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec, nsec);
     } else {
 	char	format[64] = "%04d-%02d-%02dT%02d:%02d:%02d.%09ld%c%02d:%02d";
 
@@ -291,10 +283,7 @@ dump_sec_nano(VALUE obj, time_t sec, long nsec, Out out) {
 	    format[32] = '0' + out->opts->sec_prec;
 	    len -= 9 - out->opts->sec_prec;
 	}
-	len = sprintf(buf, format,
-		      tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-		      tm->tm_hour, tm->tm_min, tm->tm_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);
 }
@@ -323,7 +312,7 @@ dump_time(VALUE obj, int depth, Out out, bool as_ok) {
 
 static void
 dump_timewithzone(VALUE obj, int depth, Out out, bool as_ok) {
-    time_t	sec = NUM2LONG(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
+    int64_t	sec = NUM2LONG(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
     long long	nsec = 0;
 
     if (rb_respond_to(obj, oj_tv_nsec_id)) {

data/ext/oj/util.c

@@ -0,0 +1,136 @@
+// Copyright (c) 2019, Peter Ohler, All rights reserved.
+
+#include "util.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+#define SECS_PER_DAY		86400LL
+#define SECS_PER_YEAR		31536000LL
+#define SECS_PER_LEAP		31622400LL
+#define SECS_PER_QUAD_YEAR	(SECS_PER_YEAR * 3 + SECS_PER_LEAP)
+#define SECS_PER_CENT		(SECS_PER_QUAD_YEAR * 24 + SECS_PER_YEAR * 4)
+#define SECS_PER_LEAP_CENT	(SECS_PER_CENT + SECS_PER_DAY)
+#define SECS_PER_QUAD_CENT	(SECS_PER_CENT * 4 + SECS_PER_DAY)
+
+static int64_t	eom_secs[] = {
+    2678400,  // January (31)
+    5097600,  // February (28)	2419200	 2505600
+    7776000,  // March (31)
+    10368000, // April (30  2592000
+    13046400, // May (31)
+    15638400, // June (30)
+    18316800, // July (31)
+    20995200, // August (31)
+    23587200, // September (30)
+    26265600, // October (31)
+    28857600, // November (30)
+    31536000, // December (31)
+};
+
+static int64_t	eom_leap_secs[] = {
+    2678400,  // January (31)
+    5184000,  // February (28)	2419200	 2505600
+    7862400,  // March (31)
+    10454400, // April (30  2592000
+    13132800, // May (31)
+    15724800, // June (30)
+    18403200, // July (31)
+    21081600, // August (31)
+    23673600, // September (30)
+    26352000, // October (31)
+    28944000, // November (30)
+    31622400, // December (31)
+};
+
+
+void
+sec_as_time(int64_t secs, TimeInfo ti) {
+    int64_t	qc = 0;
+    int64_t	c = 0;
+    int64_t	qy = 0;
+    int64_t	y = 0;
+    bool	leap = false;
+    int64_t	*ms;
+    int		m;
+    int		shift = 0;
+
+    secs += 62167219200LL; // normalize to first day of the year 0
+    if (secs < 0) {
+	shift = -secs / SECS_PER_QUAD_CENT;
+	shift++;
+	secs += shift * SECS_PER_QUAD_CENT;
+    }
+    qc = secs / SECS_PER_QUAD_CENT;
+    secs = secs - qc * SECS_PER_QUAD_CENT;
+    if (secs < SECS_PER_LEAP) {
+	leap = true;
+    } else if (secs < SECS_PER_QUAD_YEAR) {
+	if (SECS_PER_LEAP <= secs) {
+	    secs -= SECS_PER_LEAP;
+	    y = secs / SECS_PER_YEAR;
+	    secs = secs - y * SECS_PER_YEAR;
+	    y++;
+	    leap = true;
+	}
+    } else if (secs < SECS_PER_LEAP_CENT) { // first century in 400 years is a leap century (one extra day)
+	qy = secs / SECS_PER_QUAD_YEAR;
+	secs = secs - qy * SECS_PER_QUAD_YEAR;
+	if (secs < SECS_PER_LEAP) {
+	    leap = true;
+	} else {
+	    secs -= SECS_PER_LEAP;
+	    y = secs / SECS_PER_YEAR;
+	    secs = secs - y * SECS_PER_YEAR;
+	    y++;
+	}
+    } else {
+	secs -= SECS_PER_LEAP_CENT;
+	c = secs / SECS_PER_CENT;
+	secs = secs - c * SECS_PER_CENT;
+	c++;
+	if (secs < SECS_PER_YEAR * 4) {
+	    y = secs / SECS_PER_YEAR;
+	    secs = secs - y * SECS_PER_YEAR;
+	} else {
+	    secs -= SECS_PER_YEAR * 4;
+	    qy = secs / SECS_PER_QUAD_YEAR;
+	    secs = secs - qy * SECS_PER_QUAD_YEAR;
+	    qy++;
+	    if (secs < SECS_PER_LEAP) {
+		leap = true;
+	    } else {
+		secs -= SECS_PER_LEAP;
+		y = secs / SECS_PER_YEAR;
+		secs = secs - y * SECS_PER_YEAR;
+		y++;
+	    }
+	}
+    }
+    ti->year = (qc - shift) * 400 + c * 100 + qy * 4 + y;
+    if (leap) {
+	ms = eom_leap_secs;
+    } else {
+	ms = eom_secs;
+    }
+    for (m = 1; m <= 12; m++, ms++) {
+	if (secs < *ms) {
+	    if (1 < m) {
+		secs -= *(ms - 1);
+	    }
+	    ti->mon = m;
+	    break;
+	}
+    }
+    ti->day = secs / 86400LL;
+    secs = secs - (int64_t)ti->day * 86400LL;
+    ti->day++;
+    ti->hour = secs / 3600LL;
+    secs = secs - (int64_t)ti->hour * 3600LL;
+    ti->min = secs / 60LL;
+    secs = secs - (int64_t)ti->min * 60LL;
+    ti->sec = secs;
+}

data/ext/oj/util.h

@@ -0,0 +1,19 @@
+// Copyright (c) 2019, Peter Ohler, All rights reserved.
+
+#ifndef OJ_UTIL_H
+#define OJ_UTIL_H
+
+#include <stdint.h>
+
+typedef struct _timeInfo {
+    int sec;
+    int min;
+    int hour;
+    int day;
+    int mon;
+    int year;
+} *TimeInfo;
+
+extern void	sec_as_time(int64_t secs, TimeInfo ti);
+
+#endif /* OJ_UTIL_H */

data/ext/oj/val_stack.c

@@ -31,6 +31,7 @@
 #include <string.h>
 
 #include "oj.h"
+#include "odd.h"
 #include "val_stack.h"
 
 static void
@@ -54,6 +55,16 @@ mark(void *ptr) {
 	if (Qnil != v->key_val && Qundef != v->key_val) {
 	    rb_gc_mark(v->key_val);
 	}
+	if (NULL != v->odd_args) {
+	    VALUE	*a;
+	    int		i;
+
+	    for (i = v->odd_args->odd->attr_cnt, a = v->odd_args->args; 0 < i; i--, a++) {
+		if (Qnil != *a) {
+		    rb_gc_mark(*a);
+		}
+	    }
+	}
     }
 #if HAVE_LIBPTHREAD
     pthread_mutex_unlock(&stack->mutex);
@@ -77,12 +88,15 @@ oj_stack_init(ValStack stack) {
     stack->end = stack->base + sizeof(stack->base) / sizeof(struct _val);
     stack->tail = stack->head;
     stack->head->val = Qundef;
-    stack->head->key = 0;
+    stack->head->key = NULL;
     stack->head->key_val = Qundef;
-    stack->head->classname = 0;
+    stack->head->classname = NULL;
+    stack->head->odd_args = NULL;
+    stack->head->clas = Qundef;
     stack->head->klen = 0;
     stack->head->clen = 0;
     stack->head->next = NEXT_NONE;
+
     return Data_Wrap_Struct(oj_cstack_class, mark, 0, stack);
 }
 

data/ext/oj/val_stack.h

@@ -57,13 +57,9 @@ typedef struct _val {
     const char		*key;
     char		karray[32];
     volatile VALUE	key_val;
-    union {
-	struct {
-	    const char	*classname;
-	    VALUE	clas;
-	};
-	OddArgs		odd_args;
-    };
+    const char		*classname;
+    VALUE		clas;
+    OddArgs		odd_args;
     uint16_t		klen;
     uint16_t		clen;
     char		next; // ValNext
@@ -132,6 +128,7 @@ stack_push(ValStack stack, VALUE val, ValNext next) {
     stack->tail->next = next;
     stack->tail->classname = NULL;
     stack->tail->clas = Qundef;
+    stack->tail->odd_args = NULL;
     stack->tail->key = 0;
     stack->tail->key_val = Qundef;
     stack->tail->clen = 0;

data/ext/oj/wab.c

@@ -15,6 +15,7 @@
 #include "encode.h"
 #include "dump.h"
 #include "trace.h"
+#include "util.h"
 
 // Workaround in case INFINITY is not defined in math.h or if the OS is CentOS
 #define OJ_INFINITY (1.0/0.0)
@@ -193,11 +194,11 @@ dump_hash(VALUE obj, int depth, Out out, bool as_ok) {
 
 static void
 dump_time(VALUE obj, Out out) {
-    char	buf[64];
-    struct tm	*tm;
-    int		len;
-    time_t	sec;
-    long long	nsec;
+    char		buf[64];
+    struct _timeInfo	ti;
+    int			len;
+    time_t		sec;
+    long long		nsec;
 
 #ifdef HAVE_RB_TIME_TIMESPEC
     if (16 <= sizeof(struct timespec)) {
@@ -216,11 +217,9 @@ dump_time(VALUE obj, Out out) {
 
     assure_size(out, 36);
     // 2012-01-05T23:58:07.123456000Z
-    tm = gmtime(&sec);
+    sec_as_time(sec, &ti);
 
-    len = sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02d.%09ldZ",
-		  tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-		  tm->tm_hour, tm->tm_min, tm->tm_sec, (long)nsec);
+    len = sprintf(buf, "%04d-%02d-%02dT%02d:%02d:%02d.%09ldZ", ti.year, ti.mon, ti.day, ti.hour, ti.min, ti.sec, (long)nsec);
     oj_dump_cstr(buf, len, 0, 0, out);
 }
 

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '3.7.7'
+  VERSION = '3.7.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.7.7
+  version: 3.7.8
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -139,6 +139,8 @@ files:
 - ext/oj/string_writer.c
 - ext/oj/trace.c
 - ext/oj/trace.h
+- ext/oj/util.c
+- ext/oj/util.h
 - ext/oj/val_stack.c
 - ext/oj/val_stack.h
 - ext/oj/wab.c
@@ -271,8 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A fast JSON parser and serializer.