--- JSON-XS/XS.xs	2008/06/03 06:43:45	1.87
+++ JSON-XS/XS.xs	2008/07/20 17:55:19	1.90
@@ -81,7 +81,7 @@
   INCR_M_JSON    // outside anything, count nesting
 };
 
-#define INCR_DONE(json) (!(json)->incr_nest && (json)->incr_mode == INCR_M_JSON)
+#define INCR_DONE(json) ((json)->incr_nest <= 0 && (json)->incr_mode == INCR_M_JSON)
 
 typedef struct {
   U32 flags;
@@ -94,7 +94,7 @@
   // for the incremental parser
   SV *incr_text;   // the source text so far
   STRLEN incr_pos; // the current offset into the text
-  unsigned char incr_nest;   // {[]}-nesting level
+  int incr_nest;   // {[]}-nesting level
   unsigned char incr_mode;
 } JSON;
 
@@ -1420,10 +1420,19 @@
    * assertion with -DDEBUGGING, although SvCUR is documented to
    * return the xpv_cur field which certainly exists after upgrading.
    * according to nicholas clark, calling SvPOK fixes this.
+   * But it doesn't fix it, so try another workaround, call SvPV_nolen
+   * and hope for the best.
+   * Damnit, SvPV_nolen still trips over yet another assertion. This
+   * assertion business is seriously broken, try yet another workaround
+   * for the broken -DDEBUGGING.
    */
-  SvPOK (string);
+#ifdef DEBUGGING
+  offset = SvOK (string) ? sv_len (string) : 0;
+#else
+  offset = SvCUR (string);
+#endif
 
-  if (SvCUR (string) > json->max_size && json->max_size)
+  if (offset > json->max_size && json->max_size)
     croak ("attempted decode of JSON text of %lu bytes size, but max_size is set to %lu",
            (unsigned long)SvCUR (string), (unsigned long)json->max_size);
 
@@ -1600,7 +1609,7 @@
 
                     case ']':
                     case '}':
-                      if (!--self->incr_nest)
+                      if (--self->incr_nest <= 0)
                         goto interrupt;
                   }
               }