--- JSON-XS/XS.xs	2007/05/09 16:10:37	1.30
+++ JSON-XS/XS.xs	2007/05/23 20:26:40	1.33
@@ -374,8 +374,13 @@
       // that randomises hash orderings
       if (enc->flags & F_CANONICAL)
         {
-          HE *he, *hes [count]; // if your compiler dies here, you need to enable C99 mode
           int fast = 1;
+          HE *he;
+#if WIN32
+          HE **hes = _alloca (count * sizeof (HE));
+#else
+          HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
+#endif
 
           i = 0;
           while ((he = hv_iternext (hv)))
@@ -985,9 +990,10 @@
 }
 
 static SV *
-decode_json (SV *string, U32 flags)
+decode_json (SV *string, U32 flags, UV *offset_return)
 {
   dec_t dec;
+  UV offset;
   SV *sv;
 
   SvGETMAGIC (string);
@@ -1007,14 +1013,34 @@
   dec.depth    = 0;
   dec.maxdepth = DEC_DEPTH (dec.flags);
 
-  *dec.end = 0; // this should basically be a nop, too, but make sure its there
+  *dec.end = 0; // this should basically be a nop, too, but make sure it's there
   sv = decode_sv (&dec);
 
+  if (!(offset_return || !sv))
+    {
+      // check for trailing garbage
+      decode_ws (&dec);
+
+      if (*dec.cur)
+        {
+          dec.err = "garbage after JSON object";
+          SvREFCNT_dec (sv);
+          sv = 0;
+        }
+    }
+
+  if (offset_return || !sv)
+    {
+      offset = dec.flags & F_UTF8
+               ? dec.cur - SvPVX (string)
+               : utf8_distance (dec.cur, SvPVX (string));
+
+      if (offset_return)
+        *offset_return = offset;
+    }
+
   if (!sv)
     {
-      IV offset = dec.flags & F_UTF8
-                  ? dec.cur - SvPVX (string)
-                  : utf8_distance (dec.cur, SvPVX (string));
       SV *uni = sv_newmortal ();
 
       // horrible hack to silence warning inside pv_uni_display
@@ -1118,7 +1144,16 @@
 
 void decode (SV *self, SV *jsonstr)
 	PPCODE:
-        XPUSHs (decode_json (jsonstr, *SvJSON (self)));
+        XPUSHs (decode_json (jsonstr, *SvJSON (self), 0));
+
+void decode_prefix (SV *self, SV *jsonstr)
+	PPCODE:
+{
+  	UV offset;
+        EXTEND (SP, 2);
+        PUSHs (decode_json (jsonstr, *SvJSON (self), &offset));
+        PUSHs (sv_2mortal (newSVuv (offset)));
+}
 
 PROTOTYPES: ENABLE
 
@@ -1132,5 +1167,5 @@
 	ALIAS:
         jsonToObj = 0
 	PPCODE:
-        XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8));
+        XPUSHs (decode_json (jsonstr, F_DEFAULT | F_UTF8, 0));