--- JSON-XS/XS.xs	2016/10/07 05:18:48	1.128
+++ JSON-XS/XS.xs	2016/11/26 06:09:29	1.130
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <limits.h>
 #include <float.h>
+#include <inttypes.h>
 
 #if defined(__BORLANDC__) || defined(_MSC_VER)
 # define snprintf _snprintf // C compilers have this in stdio.h
@@ -363,7 +364,7 @@
 INLINE void
 need (enc_t *enc, STRLEN len)
 {
-  if (expect_false (enc->cur + len >= enc->end))
+  if (expect_false ((uintptr_t)(enc->end - enc->cur) < len))
     {
       STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
       SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
@@ -1691,7 +1692,7 @@
 }
 
 static SV *
-decode_json (SV *string, JSON *json, char **offset_return)
+decode_json (SV *string, JSON *json, STRLEN *offset_return)
 {
   dec_t dec;
   SV *sv;
@@ -1754,9 +1755,8 @@
   sv = decode_sv (&dec);
 
   if (offset_return)
-    *offset_return = dec.cur;
-
-  if (!(offset_return || !sv))
+    *offset_return = dec.cur - SvPVX (string);
+  else if (sv)
     {
       // check for trailing garbage
       decode_ws (&dec);
@@ -2113,11 +2113,11 @@
 	PPCODE:
 {
 	SV *sv;
-        char *offset;
+        STRLEN offset;
         PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
         EXTEND (SP, 2);
         PUSHs (sv);
-        PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
+        PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, SvPV_nolen (jsonstr) + offset))));
 }
 
 void incr_parse (JSON *self, SV *jsonstr = 0)
@@ -2174,7 +2174,7 @@
           do
             {
               SV *sv;
-              char *offset;
+              STRLEN offset;
 
               if (!INCR_DONE (self))
                 {
@@ -2200,11 +2200,11 @@
               PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
               XPUSHs (sv);
 
-              self->incr_pos -= offset - SvPVX (self->incr_text);
+              self->incr_pos -= offset;
               self->incr_nest = 0;
               self->incr_mode = 0;
 
-              sv_chop (self->incr_text, offset);
+              sv_chop (self->incr_text, SvPVX (self->incr_text) + offset);
             }
           while (GIMME_V == G_ARRAY);
 }