ox 2.12.0 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5923d0aee2bea7b543f7aec674879c552846492786d05af0d7fd6447f4e60d3b
-  data.tar.gz: b0acca612b1a7624847d0c2399f18b7d122c4d9f41a77deaee23ac96c76d87c2
+  metadata.gz: 4d2959b76c94fd92a6234a9cf211f27263ac36da3e0b74bc724edc2f278585a4
+  data.tar.gz: eae845e3147144ee70d3b8f41603295c962c00a202282af8b0bd42cacde02ade
 SHA512:
-  metadata.gz: 5c9f59561ace452549c579d22f30b3c0101f0ec9e1f3bf302d711aee2844af32c5c575057fb28c60aecff009c7314d4772691c187368517939ec0ed8a48fc74d
-  data.tar.gz: 4a13ef2c59d159cb1728751c1ec7eb896df35909fb6434e65d722a8ef96e96a2a95e309852f21daf6de87c41e7ca13b13d19015f5bbaed1b0a0dcca5d14b123c
+  metadata.gz: fe53b32f1daae7e8444ce0efa476f3b69fee96b72b5f61dcda51aca3769bac24a2edbfc7aae914bcb073e845af7487d7004fec0b8c6408bee1b3515c6bff6315
+  data.tar.gz: ee673dbd381c0983cf592090c7bf01d99cbd23d9c5a2740892c9db688bf294824e4510ceff4bb31a0e340c13db8b78bb09badae1186c1929edd27ec59b8da9b2

data/CHANGELOG.md

@@ -4,8 +4,18 @@ All changes to the Ox gem are documented here. Releases follow semantic versioni
 
 ## [Unreleased]
 
+## [2.12.1] - 2020-01-05
+
+Ruby 2.7.0
+
+### Fixed
+
+- Updated for Ruby 2.7.0. More strict type checking. Function signature changes, and `Object#taint` deprecated.
+
 ## [2.12.0] - 2019-12-18
 
+### Added
+
 - Add `no_empty` option to not allow <xyz/> and use <xyz></xyz> instead.
 
 ## [2.11.0] - 2019-06-14

data/ext/ox/builder.c

@@ -17,7 +17,7 @@
 typedef struct _element {
     char	*name;
     char	buf[64];
-    int		len;
+    long	len;
     bool	has_child;
     bool	non_text_child;
 } *Element;
@@ -124,7 +124,7 @@ append_string(Builder b, const char *str, size_t size, const char *table, bool s
 	char	buf[256];
 	char	*end = buf + sizeof(buf) - 1;
 	char	*bp = buf;
-	int	i = size;
+	size_t	i = size;
 	int	fcnt;
 
 	for (; '\0' != *str && 0 < i; i--, str++) {
@@ -183,7 +183,7 @@ append_string(Builder b, const char *str, size_t size, const char *table, bool s
 static void
 append_sym_str(Builder b, VALUE v) {
     const char	*s;
-    int		len;
+    long	len;
 
     switch (rb_type(v)) {
     case T_STRING:
@@ -219,7 +219,9 @@ i_am_a_child(Builder b, bool is_text) {
 }
 
 static int
-append_attr(VALUE key, VALUE value, Builder b) {
+append_attr(VALUE key, VALUE value, VALUE bv) {
+    Builder	b = (Builder)bv;
+
     buf_append(&b->buf, ' ');
     b->col++;
     b->pos++;
@@ -600,7 +602,7 @@ builder_element(int argc, VALUE *argv, VALUE self) {
     Builder		b = (Builder)DATA_PTR(self);
     Element		e;
     const char		*name;
-    int			len;
+    long		len;
 
     if (1 > argc) {
 	rb_raise(ox_arg_error_class, "missing element name");
@@ -662,7 +664,7 @@ static VALUE
 builder_void_element(int argc, VALUE *argv, VALUE self) {
     Builder	b = (Builder)DATA_PTR(self);
     const char	*name;
-    int		len;
+    long	len;
 
     if (1 > argc) {
 	rb_raise(ox_arg_error_class, "missing element name");

data/ext/ox/dump.c

@@ -54,7 +54,7 @@ static void	dump_obj(ID aid, VALUE obj, int depth, Out out);
 static void	dump_gen_doc(VALUE obj, int depth, Out out);
 static void	dump_gen_element(VALUE obj, int depth, Out out);
 static void	dump_gen_instruct(VALUE obj, int depth, Out out);
-static int	dump_gen_attr(VALUE key, VALUE value, Out out);
+static int	dump_gen_attr(VALUE key, VALUE value, VALUE ov);
 static int	dump_gen_nodes(VALUE obj, int depth, Out out);
 static void	dump_gen_val_node(VALUE obj, int depth,
 				  const char *pre, size_t plen,
@@ -67,12 +67,12 @@ static void	grow(Out out, size_t len);
 
 static void	dump_value(Out out, const char *value, size_t size);
 static void	dump_str_value(Out out, const char *value, size_t size, const char *table);
-static int	dump_var(ID key, VALUE value, Out out);
+static int	dump_var(ID key, VALUE value, VALUE ov);
 static void	dump_num(Out out, VALUE obj);
 static void	dump_date(Out out, VALUE obj);
 static void	dump_time_thin(Out out, VALUE obj);
 static void	dump_time_xsd(Out out, VALUE obj);
-static int	dump_hash(VALUE key, VALUE value, Out out);
+static int	dump_hash(VALUE key, VALUE value, VALUE ov);
 
 static int	is_xml_friendly(const uchar *str, int len, const char *table);
 
@@ -1005,7 +1005,9 @@ dump_obj(ID aid, VALUE obj, int depth, Out out) {
 }
 
 static int
-dump_var(ID key, VALUE value, Out out) {
+dump_var(ID key, VALUE value, VALUE ov) {
+    Out	out = (Out)ov;
+
     if (T_DATA == rb_type(value) && key == ox_mesg_id) {
 	/* There is a secret recipe that keeps Exception mesg attributes as a
 	 * T_DATA until it is needed. The safe way around this hack is to call
@@ -1022,7 +1024,9 @@ dump_var(ID key, VALUE value, Out out) {
 }
 
 static int
-dump_hash(VALUE key, VALUE value, Out out) {
+dump_hash(VALUE key, VALUE value, VALUE ov) {
+    Out	out = (Out)ov;
+
     dump_obj(0, key, out->depth, out);
     dump_obj(0, value, out->depth, out);
 
@@ -1198,7 +1202,9 @@ dump_gen_nodes(VALUE obj, int depth, Out out) {
 }
 
 static int
-dump_gen_attr(VALUE key, VALUE value, Out out) {
+dump_gen_attr(VALUE key, VALUE value, VALUE ov) {
+    Out	out = (Out)ov;
+
     const char	*ks;
     size_t	klen;
     size_t	size;

data/ext/ox/extconf.rb

@@ -20,7 +20,7 @@ dflags = {
   'RUBY_VERSION_MICRO' => version[2],
   'HAS_RB_TIME_TIMESPEC' => ('ruby' == type && ('1.9.3' == RUBY_VERSION)) ? 1 : 0,
   #'HAS_RB_TIME_TIMESPEC' => ('ruby' == type && ('1.9.3' == RUBY_VERSION || '2' <= version[0])) ? 1 : 0,
-  'HAS_TM_GMTOFF' => ('ruby' == type && (('1' == version[0] && '9' == version[1]) || '2' <= version[0]) && 
+  'HAS_TM_GMTOFF' => ('ruby' == type && (('1' == version[0] && '9' == version[1]) || '2' <= version[0]) &&
                       !(platform.include?('cygwin') || platform.include?('solaris') || platform.include?('linux') || RUBY_PLATFORM =~ /(win|w)32$/)) ? 1 : 0,
   'HAS_ENCODING_SUPPORT' => (('ruby' == type || 'rubinius' == type || 'macruby' == type) &&
                              (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
@@ -62,6 +62,10 @@ dflags.each do |k,v|
 end
 $CPPFLAGS += ' -Wall'
 #puts "*** $CPPFLAGS: #{$CPPFLAGS}"
+CONFIG['warnflags'].slice!(/ -Wsuggest-attribute=format/)
+CONFIG['warnflags'].slice!(/ -Wdeclaration-after-statement/)
+CONFIG['warnflags'].slice!(/ -Wmissing-noreturn/)
+
 create_makefile(extension_name)
 
 %x{make clean}

data/ext/ox/hash_load.c

@@ -13,12 +13,14 @@
 #include "ruby.h"
 #include "ox.h"
 
+#define MARK_INC	256
+
 // The approach taken for the hash and has_no_attrs parsing is to push just
 // the key on to the stack and then decide what to do on the way up/out.
 
 static VALUE
 create_top(PInfo pi) {
-    volatile VALUE       top = rb_hash_new();;
+    volatile VALUE       top = rb_hash_new();
 
     helper_stack_push(&pi->helpers, 0, top, HashCode);
     pi->obj = top;
@@ -26,6 +28,51 @@ create_top(PInfo pi) {
     return top;
 }
 
+static void
+mark_value(PInfo pi, VALUE val) {
+    if (NULL == pi->marked) {
+	pi->marked = ALLOC_N(VALUE, MARK_INC);
+	pi->mark_size = MARK_INC;
+    } else if (pi->mark_size <= pi->mark_cnt) {
+	pi->mark_size += MARK_INC;
+	pi->marked = REALLOC_N(pi->marked, VALUE, pi->mark_size);
+    }
+    pi->marked[pi->mark_cnt] = val;
+    pi->mark_cnt++;
+}
+
+static bool
+marked(PInfo pi, VALUE val) {
+    if (NULL != pi->marked) {
+	VALUE	*vp = pi->marked + pi->mark_cnt - 1;
+
+	for (; pi->marked <= vp; vp--) {
+	    if (val == *vp) {
+		return true;
+	    }
+	}
+    }
+    return false;
+}
+
+static void
+unmark(PInfo pi, VALUE val) {
+    if (NULL != pi->marked) {
+	VALUE	*vp = pi->marked + pi->mark_cnt - 1;
+	int		i;
+
+	for (i = 0; pi->marked <= vp; vp--, i++) {
+	    if (val == *vp) {
+		for (; 0 < i; i--, vp++) {
+		    *vp = *(vp + 1);
+		}
+		pi->mark_cnt--;
+		break;
+	    }
+	}
+    }
+}
+
 static void
 add_text(PInfo pi, char *text, int closed) {
     Helper		parent = helper_stack_peek(&pi->helpers);
@@ -92,7 +139,7 @@ add_element(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
 	}
 	a = rb_ary_new();
 	rb_ary_push(a, h);
-	rb_obj_taint(a); // flag indicating it is a unit, kind of a hack but it works
+	mark_value(pi, a);
 	helper_stack_push(&pi->helpers, rb_intern(ename), a, ArrayCode);
     } else {
 	helper_stack_push(&pi->helpers, rb_intern(ename), Qnil, NoCode);
@@ -108,15 +155,14 @@ add_element_no_attrs(PInfo pi, const char *ename, Attr attrs, int hasChildren) {
 }
 
 static int
-untaint_hash_cb(VALUE key, VALUE value, VALUE x) {
-    if (Qtrue == rb_obj_tainted(value)) {
-	rb_obj_untaint(value);
-    }
+umark_hash_cb(VALUE key, VALUE value, VALUE x) {
+    unmark((PInfo)x, value);
+
     return ST_CONTINUE;
 }
 
 static void
-end_element_core(PInfo pi, const char *ename, bool check_taint) {
+end_element_core(PInfo pi, const char *ename, bool check_marked) {
     Helper		e = helper_stack_pop(&pi->helpers);
     Helper		parent = helper_stack_peek(&pi->helpers);
     volatile VALUE	pobj = parent->obj;
@@ -161,8 +207,8 @@ end_element_core(PInfo pi, const char *ename, bool check_taint) {
     if (Qundef == found) {
 	rb_hash_aset(pobj, key, e->obj);
     } else if (RUBY_T_ARRAY == rb_type(found)) {
-	if (check_taint && Qtrue == rb_obj_tainted(found)) {
-	    rb_obj_untaint(found);
+	if (check_marked && marked(pi, found)) {
+	    unmark(pi, found);
 	    a = rb_ary_new();
 	    rb_ary_push(a, found);
 	    rb_ary_push(a, e->obj);
@@ -171,16 +217,16 @@ end_element_core(PInfo pi, const char *ename, bool check_taint) {
 	    rb_ary_push(found, e->obj);
 	}
     } else { // something there other than an array
-	if (check_taint && Qtrue == rb_obj_tainted(e->obj)) {
-	    rb_obj_untaint(e->obj);
+	if (check_marked && marked(pi, e->obj)) {
+	    unmark(pi, e->obj);
 	}
 	a = rb_ary_new();
 	rb_ary_push(a, found);
 	rb_ary_push(a, e->obj);
 	rb_hash_aset(pobj, key, a);
     }
-    if (check_taint && RUBY_T_HASH == rb_type(e->obj)) {
-	rb_hash_foreach(e->obj, untaint_hash_cb, Qnil);
+    if (check_marked && NULL != pi->marked && RUBY_T_HASH == rb_type(e->obj)) {
+	rb_hash_foreach(e->obj, umark_hash_cb, (VALUE)pi);
     }
 }
 
@@ -196,9 +242,7 @@ end_element_no_attrs(PInfo pi, const char *ename) {
 
 static void
 finish(PInfo pi) {
-    if (Qnil != pi->obj && RUBY_T_HASH == rb_type(pi->obj)) {
-	rb_hash_foreach(pi->obj, untaint_hash_cb, Qnil);
-    }
+    xfree(pi->marked);
 }
 
 struct _parseCallbacks   _ox_hash_callbacks = {

data/ext/ox/ox.h

@@ -155,7 +155,7 @@ typedef struct _options {
 #endif
 } *Options;
 
-/* parse information structure */
+// parse information structure
 struct _pInfo {
     struct _helperStack	helpers;
     struct _err		err;
@@ -167,6 +167,9 @@ struct _pInfo {
     CircArray		circ_array;
     unsigned long	id;		// set for text types when cirs_array is set
     Options		options;
+    VALUE		*marked;
+    int			mark_size;	// allocated size
+    int			mark_cnt;
     char		last;		// last character read, rarely set
 };
 

data/ext/ox/parse.c

@@ -121,7 +121,7 @@ ox_parse(char *xml, size_t len, ParseCallbacks pcb, char **endp, Options options
     if (DEBUG <= options->trace) {
 	printf("Parsing xml:\n%s\n", xml);
     }
-    /* initialize parse info */
+    // initialize parse info
     helper_stack_init(&pi.helpers);
     // Protect against GC
     wrap = Data_Wrap_Struct(rb_cObject, mark_pi_cb, NULL, &pi);
@@ -134,8 +134,11 @@ ox_parse(char *xml, size_t len, ParseCallbacks pcb, char **endp, Options options
     pi.obj = Qnil;
     pi.circ_array = 0;
     pi.options = options;
+    pi.marked = NULL;
+    pi.mark_size = 0;
+    pi.mark_cnt = 0;
     while (1) {
-	next_non_white(&pi);	/* skip white space */
+	next_non_white(&pi);	// skip white space
 	if ('\0' == *pi.s) {
 	    break;
 	}
@@ -143,31 +146,31 @@ ox_parse(char *xml, size_t len, ParseCallbacks pcb, char **endp, Options options
 	    *endp = pi.s;
 	    break;
 	}
-	if ('<' != *pi.s) {		/* all top level entities start with < */
+	if ('<' != *pi.s) {		// all top level entities start with <
 	    set_error(err, "invalid format, expected <", pi.str, pi.s);
 	    helper_stack_cleanup(&pi.helpers);
 	    return Qnil;
 	}
-	pi.s++;		/* past < */
+	pi.s++;		// past <
 	switch (*pi.s) {
-	case '?':	/* processing instruction */
+	case '?':	// processing instruction
 	    pi.s++;
 	    read_instruction(&pi);
 	    break;
-	case '!':	/* comment or doctype */
+	case '!':	// comment or doctype
 	    pi.s++;
 	    if ('\0' == *pi.s) {
 		set_error(err, "invalid format, DOCTYPE or comment not terminated", pi.str, pi.s);
 		helper_stack_cleanup(&pi.helpers);
 		return Qnil;
 	    } else if ('-' == *pi.s) {
-		pi.s++;	/* skip - */
+		pi.s++;	// skip -
 		if ('-' != *pi.s) {
 		    set_error(err, "invalid format, bad comment format", pi.str, pi.s);
 		    helper_stack_cleanup(&pi.helpers);
 		    return Qnil;
 		} else {
-		    pi.s++;	/* skip second - */
+		    pi.s++;	// skip second -
 		    read_comment(&pi);
 		}
 	    } else if ((TolerantEffort == options->effort) ? 0 == strncasecmp("DOCTYPE", pi.s, 7) : 0 == strncmp("DOCTYPE", pi.s, 7)) {
@@ -229,8 +232,7 @@ gather_content(const char *src, char *content, size_t len) {
     return 0;
 }
 
-/* Entered after the "<?" sequence. Ready to read the rest.
- */
+// Entered after the "<?" sequence. Ready to read the rest.
 static void
 read_instruction(PInfo pi) {
     char		content[1024];
@@ -255,7 +257,7 @@ read_instruction(PInfo pi) {
     }
     next_non_white(pi);
     c = *pi->s;
-    *end = '\0'; /* terminate name */
+    *end = '\0'; // terminate name
     if ('?' != c) {
 	while ('?' != c) {
 	    pi->last = 0;
@@ -275,8 +277,8 @@ read_instruction(PInfo pi) {
 		attrs_ok = 0;
 		break;
 	    }
-	    *end = '\0'; /* terminate name */
-	    /* read value */
+	    *end = '\0'; // terminate name
+	    // read value
 	    next_non_white(pi);
 	    if (0 == (attr_value = read_quoted_value(pi))) {
 		attr_stack_cleanup(&attrs);
@@ -355,9 +357,8 @@ read_delimited(PInfo pi, char end) {
     }
 }
 
-/* Entered after the "<!DOCTYPE" sequence plus the first character after
- * that. Ready to read the rest.
- */
+// Entered after the "<!DOCTYPE" sequence plus the first character after
+// that. Ready to read the rest.
 static void
 read_doctype(PInfo pi) {
     char	*docType;
@@ -376,8 +377,7 @@ read_doctype(PInfo pi) {
     }
 }
 
-/* Entered after "<!--". Returns error code.
- */
+// Entered after "<!--". Returns error code.
 static void
 read_comment(PInfo pi) {
     char	*end;
@@ -406,16 +406,15 @@ read_comment(PInfo pi) {
 	    break;
 	}
     }
-    *end = '\0'; /* in case the comment was blank */
+    *end = '\0'; // in case the comment was blank
     pi->s = end + 3;
     if (0 != pi->pcb->add_comment) {
 	pi->pcb->add_comment(pi, comment);
     }
 }
 
-/* Entered after the '<' and the first character after that. Returns status
- * code.
- */
+// Entered after the '<' and the first character after that. Returns stat
+// code.
 static char*
 read_element(PInfo pi) {
     struct _attrStack	attrs;
@@ -439,7 +438,7 @@ read_element(PInfo pi) {
     c = *pi->s;
     *end = '\0';
     if ('/' == c) {
-	/* empty element, no attributes and no children */
+	// empty element, no attributes and no children
 	pi->s++;
 	if ('>' != *pi->s) {
 	    /*printf("*** '%s' ***\n", pi->s); */

data/ext/ox/sax.c

@@ -55,7 +55,7 @@ static char		read_attrs(SaxDrive dr, char c, char termc, char term2, int is_xml,
 static char		read_name_token(SaxDrive dr);
 static char		read_quoted_value(SaxDrive dr);
 
-static void		end_element_cb(SaxDrive dr, VALUE name, int pos, int line, int col, Hint h);
+static void		end_element_cb(SaxDrive dr, VALUE name, long pos, long line, long col, Hint h);
 
 static void		hint_clear_empty(SaxDrive dr);
 static Nv		hint_try_close(SaxDrive dr, const char *name);
@@ -221,7 +221,7 @@ ox_sax_drive_cleanup(SaxDrive dr) {
 }
 
 static void
-ox_sax_drive_error_at(SaxDrive dr, const char *msg, int pos, int line, int col) {
+ox_sax_drive_error_at(SaxDrive dr, const char *msg, off_t pos, off_t line, off_t col) {
     if (dr->has.error) {
         VALUE   args[3];
 
@@ -301,11 +301,11 @@ parse(SaxDrive dr) {
 		    }
 		    c = read_comment(dr);
 		} else {
-		    int	i;
-		    int	spaced = 0;
-		    int	pos = dr->buf.pos + 1;
-		    int	line = dr->buf.line;
-		    int	col = dr->buf.col + 1;
+		    int		i;
+		    int		spaced = 0;
+		    off_t	pos = dr->buf.pos + 1;
+		    off_t	line = dr->buf.line;
+		    off_t	col = dr->buf.col + 1;
 
 		    if (is_white(c)) {
 			spaced = 1;
@@ -359,9 +359,9 @@ parse(SaxDrive dr) {
 		parent = stack_peek(&dr->stack);
 		if (0 != parent && 0 == parent->childCnt && dr->has.text && !dr->blocked) {
 		    VALUE	args[1];
-		    int		pos = dr->buf.pos;
-		    int		line = dr->buf.line;
-		    int		col = dr->buf.col - 1;
+		    off_t	pos = dr->buf.pos;
+		    off_t	line = dr->buf.line;
+		    off_t	col = dr->buf.col - 1;
 
 		    args[0] = rb_str_new2("");
 #if HAS_ENCODING_SUPPORT
@@ -479,9 +479,9 @@ read_instruction(SaxDrive dr) {
     int		coff;
     VALUE	target = Qnil;
     int		is_xml;
-    int		pos = dr->buf.pos - 1;
-    int		line = dr->buf.line;
-    int		col = dr->buf.col - 1;
+    off_t	pos = dr->buf.pos - 1;
+    off_t	line = dr->buf.line;
+    off_t	col = dr->buf.col - 1;
 
     buf_protect(&dr->buf);
     if ('\0' == (c = read_name_token(dr))) {
@@ -511,7 +511,7 @@ read_instruction(SaxDrive dr) {
     line = dr->buf.line;
     col = dr->buf.col;
     read_content(dr, content, sizeof(content) - 1);
-    coff = dr->buf.tail - dr->buf.head;
+    coff = (int)(dr->buf.tail - dr->buf.head);
     buf_reset(&dr->buf);
     dr->err = 0;
     c = read_attrs(dr, c, '?', '?', is_xml, 1, NULL);
@@ -523,7 +523,7 @@ read_instruction(SaxDrive dr) {
 	    VALUE   args[1];
 
 	    if (dr->options.convert_special) {
-		ox_sax_collapse_special(dr, content, pos, line, col);
+		ox_sax_collapse_special(dr, content, (int)pos, (int)line, (int)col);
 	    }
 	    args[0] = rb_str_new2(content);
 #if HAS_ENCODING_SUPPORT
@@ -627,9 +627,9 @@ read_delimited(SaxDrive dr, char end) {
  */
 static char
 read_doctype(SaxDrive dr) {
-    int		pos = dr->buf.pos - 9;
-    int		line = dr->buf.line;
-    int		col = dr->buf.col - 9;
+    long	pos = (long)(dr->buf.pos - 9);
+    long	line = (long)(dr->buf.line);
+    long	col = (long)(dr->buf.col - 9);
     char	*s;
     Nv		parent = stack_peek(&dr->stack);
 
@@ -673,9 +673,9 @@ read_cdata(SaxDrive dr) {
     char        	c;
     char        	zero = '\0';
     int         	end = 0;
-    int			pos = dr->buf.pos - 9;
-    int			line = dr->buf.line;
-    int			col = dr->buf.col - 9;
+    long		pos = (long)(dr->buf.pos - 9);
+    long		line = (long)(dr->buf.line);
+    long		col = (long)(dr->buf.col - 9);
     struct _checkPt	cp = CHECK_PT_INIT;
     Nv			parent = stack_peek(&dr->stack);
 
@@ -768,9 +768,9 @@ read_comment(SaxDrive dr) {
     char        	c;
     char        	zero = '\0';
     int         	end = 0;
-    int			pos = dr->buf.pos - 4;
-    int			line = dr->buf.line;
-    int			col = dr->buf.col - 4;
+    long		pos = (long)(dr->buf.pos - 4);
+    long		line = (long)(dr->buf.line);
+    long		col = (long)(dr->buf.col - 4);
     struct _checkPt	cp = CHECK_PT_INIT;
 
     buf_backup(&dr->buf); /* back up to the start in case the cdata is empty */
@@ -864,9 +864,9 @@ read_element_start(SaxDrive dr) {
     volatile VALUE	name = Qnil;
     char        	c;
     int			closed;
-    int			pos = dr->buf.pos;
-    int			line = dr->buf.line;
-    int			col = dr->buf.col;
+    long		pos = (long)(dr->buf.pos);
+    long		line = (long)(dr->buf.line);
+    long		col = (long)(dr->buf.col);
     Hint		h = NULL;
     int			stackless = 0;
     Nv			parent = stack_peek(&dr->stack);
@@ -1020,9 +1020,9 @@ static char
 read_element_end(SaxDrive dr) {
     VALUE       name = Qnil;
     char        c;
-    int		pos = dr->buf.pos - 1;
-    int		line = dr->buf.line;
-    int		col = dr->buf.col - 1;
+    long	pos = (long)(dr->buf.pos - 1);
+    long	line = (long)(dr->buf.line);
+    long	col = (long)(dr->buf.col - 1);
     Nv		nv;
     Hint	h = NULL;
 
@@ -1118,9 +1118,9 @@ static char
 read_text(SaxDrive dr) {
     VALUE	args[1];
     char        c;
-    int		pos = dr->buf.pos;
-    int		line = dr->buf.line;
-    int		col = dr->buf.col - 1;
+    long	pos = (long)(dr->buf.pos);
+    long	line = (long)(dr->buf.line);
+    long	col = (long)(dr->buf.col - 1);
     Nv		parent = stack_peek(&dr->stack);
     int		allWhite = 1;
 
@@ -1266,9 +1266,9 @@ static char
 read_jump(SaxDrive dr, const char *pat) {
     VALUE	args[1];
     char        c;
-    int		pos = dr->buf.pos;
-    int		line = dr->buf.line;
-    int		col = dr->buf.col - 1;
+    long	pos = (long)(dr->buf.pos);
+    long	line = (long)(dr->buf.line);
+    long	col = (long)(dr->buf.col - 1);
     Nv		parent = stack_peek(&dr->stack);
 
     buf_protect(&dr->buf);
@@ -1330,9 +1330,9 @@ static char
 read_attrs(SaxDrive dr, char c, char termc, char term2, int is_xml, int eq_req, Hint h) {
     VALUE       name = Qnil;
     int         is_encoding = 0;
-    int		pos;
-    int		line;
-    int		col;
+    off_t	pos;
+    off_t	line;
+    off_t	col;
     char	*attr_value;
 
     // already protected by caller
@@ -1580,7 +1580,7 @@ read_10_uint64(char *b, uint64_t *up) {
 }
 
 int
-ox_sax_collapse_special(SaxDrive dr, char *str, int pos, int line, int col) {
+ox_sax_collapse_special(SaxDrive dr, char *str, long pos, long line, long col) {
     char        *s = str;
     char        *b = str;
 
@@ -1731,7 +1731,7 @@ hint_try_close(SaxDrive dr, const char *name) {
 }
 
 static void
-end_element_cb(SaxDrive dr, VALUE name, int pos, int line, int col, Hint h) {
+end_element_cb(SaxDrive dr, VALUE name, long pos, long line, long col, Hint h) {
     if (dr->has.end_element && 0 >= dr->blocked && (NULL == h || ActiveOverlay == h->overlay || NestOverlay == h->overlay)) {
 	if (dr->has.pos) {
 	    rb_ivar_set(dr->handler, ox_at_pos_id, LONG2NUM(pos));

data/ext/ox/sax.h

@@ -46,7 +46,7 @@ extern void	ox_collapse_return(char *str);
 extern void	ox_sax_parse(VALUE handler, VALUE io, SaxOptions options);
 extern void	ox_sax_drive_cleanup(SaxDrive dr);
 extern void	ox_sax_drive_error(SaxDrive dr, const char *msg);
-extern int	ox_sax_collapse_special(SaxDrive dr, char *str, int pos, int line, int col);
+extern int	ox_sax_collapse_special(SaxDrive dr, char *str, long pos, long line, long col);
 
 extern VALUE	ox_sax_value_class;
 

data/lib/ox/version.rb

@@ -1,5 +1,5 @@
 
 module Ox
   # Current version of the module.
-  VERSION = '2.12.0'
+  VERSION = '2.12.1'
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: ox
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.12.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2020-01-05 00:00:00.000000000 Z
 dependencies: []
-description: "A fast XML parser and object serializer that uses only standard C lib.\n
-  \           \nOptimized XML (Ox), as the name implies was written to provide speed
-  optimized\nXML handling. It was designed to be an alternative to Nokogiri and other
-  Ruby\nXML parsers for generic XML parsing and as an alternative to Marshal for Object\nserialization. "
+description: "A fast XML parser and object serializer that uses only standard C lib.\n\nOptimized
+  XML (Ox), as the name implies was written to provide speed optimized\nXML handling.
+  It was designed to be an alternative to Nokogiri and other Ruby\nXML parsers for
+  generic XML parsing and as an alternative to Marshal for Object\nserialization. "
 email: peter@ohler.com
 executables: []
 extensions:
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A fast XML parser and object serializer.