--- JSON-XS/XS.xs	2011/08/11 17:06:53	1.112
+++ JSON-XS/XS.xs	2013/10/25 20:27:57	1.118
@@ -74,6 +74,9 @@
 # define JSON_STASH json_stash
 #endif
 
+// the amount of HEs to allocate on the stack, when sorting keys
+#define STACK_HES 64
+
 static HV *json_stash, *json_boolean_stash; // JSON::XS::
 static SV *json_true, *json_false;
 
@@ -482,7 +485,7 @@
     croak (ERR_NESTING_EXCEEDED);
 
   encode_ch (enc, '[');
-  
+
   if (len >= 0)
     {
       encode_nl (enc); ++enc->indent;
@@ -504,7 +507,7 @@
 
       encode_nl (enc); --enc->indent; encode_indent (enc);
     }
-  
+
   encode_ch (enc, ']');
 }
 
@@ -518,7 +521,7 @@
       SV *sv = HeSVKEY (he);
       STRLEN len;
       char *str;
-      
+
       SvGETMAGIC (sv);
       str = SvPV (sv, len);
 
@@ -594,11 +597,15 @@
       if (count)
         {
           int i, fast = 1;
-#if defined(__BORLANDC__) || defined(_MSC_VER)
-          HE **hes = _alloca (count * sizeof (HE));
-#else
-          HE *hes [count]; // if your compiler dies here, you need to enable C99 mode
-#endif
+          HE *hes_stack [STACK_HES];
+          HE **hes = hes_stack;
+
+          // allocate larger arrays on the heap
+          if (count > STACK_HES)
+            {
+              SV *sv = sv_2mortal (NEWSV (0, count * sizeof (*hes)));
+              hes = (HE **)SvPVX (sv);
+            }
 
           i = 0;
           while ((he = hv_iternext (hv)))
@@ -827,7 +834,7 @@
         {
           // large integer, use the (rather slow) snprintf way.
           need (enc, IVUV_MAXCHARS);
-          enc->cur += 
+          enc->cur +=
              SvIsUV(sv)
                 ? snprintf (enc->cur, IVUV_MAXCHARS, "%"UVuf, (UV)SvUVX (sv))
                 : snprintf (enc->cur, IVUV_MAXCHARS, "%"IVdf, (IV)SvIVX (sv));
@@ -838,8 +845,8 @@
   else if (!SvOK (sv) || enc->json.flags & F_ALLOW_UNKNOWN)
     encode_str (enc, "null", 4, 0);
   else
-    croak ("encountered perl type (%s,0x%x) that JSON cannot handle, you might want to report this",
-           SvPV_nolen (sv), SvFLAGS (sv));
+    croak ("encountered perl type (%s,0x%x) that JSON cannot handle, check your input data",
+           SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
 }
 
 static SV *
@@ -1261,7 +1268,7 @@
             ++dec->cur;
             break;
           }
-        
+
         if (*dec->cur != ',')
           ERR (", or ] expected while parsing array");
 
@@ -1459,8 +1466,8 @@
   // to parse everything.
   switch (*dec->cur)
     {
-      case '"': ++dec->cur; return decode_str (dec); 
-      case '[': ++dec->cur; return decode_av  (dec); 
+      case '"': ++dec->cur; return decode_str (dec);
+      case '[': ++dec->cur; return decode_av  (dec);
       case '{': ++dec->cur; return decode_hv  (dec);
 
       case '-':
@@ -1523,7 +1530,7 @@
   SV *sv;
 
   /* work around bugs in 5.10 where manipulating magic values
-   * will perl ignore the magic in subsequent accesses.
+   * makes perl ignore the magic in subsequent accesses.
    * also make a copy of non-PV values, to get them into a clean
    * state (SvPV should do that, but it's buggy, see below).
    */
@@ -1607,7 +1614,7 @@
 
       croak ("%s, at character offset %d (before \"%s\")",
              dec.err,
-             ptr_to_index (string, dec.cur),
+             (int)ptr_to_index (string, dec.cur),
              dec.cur != dec.end ? SvPV_nolen (uni) : "(end of string)");
     }
 
@@ -1807,7 +1814,7 @@
 void new (char *klass)
 	PPCODE:
 {
-  	SV *pv = NEWSV (0, sizeof (JSON));
+	SV *pv = NEWSV (0, sizeof (JSON));
         SvPOK_only (pv);
         json_init ((JSON *)SvPVX (pv));
         XPUSHs (sv_2mortal (sv_bless (
@@ -1894,7 +1901,7 @@
 void filter_json_single_key_object (JSON *self, SV *key, SV *cb = &PL_sv_undef)
 	PPCODE:
 {
-  	if (!self->cb_sk_object)
+	if (!self->cb_sk_object)
           self->cb_sk_object = newHV ();
 
         if (SvOK (cb))
@@ -1915,18 +1922,22 @@
 
 void encode (JSON *self, SV *scalar)
 	PPCODE:
-        XPUSHs (encode_json (scalar, self));
+        PUTBACK; scalar = encode_json (scalar, self); SPAGAIN;
+        XPUSHs (scalar);
 
 void decode (JSON *self, SV *jsonstr)
 	PPCODE:
-        XPUSHs (decode_json (jsonstr, self, 0));
+        PUTBACK; jsonstr = decode_json (jsonstr, self, 0); SPAGAIN;
+        XPUSHs (jsonstr);
 
 void decode_prefix (JSON *self, SV *jsonstr)
 	PPCODE:
 {
+	SV *sv;
         char *offset;
+        PUTBACK; sv = decode_json (jsonstr, self, &offset); SPAGAIN;
         EXTEND (SP, 2);
-        PUSHs (decode_json (jsonstr, self, &offset));
+        PUSHs (sv);
         PUSHs (sv_2mortal (newSVuv (ptr_to_index (jsonstr, offset))));
 }
 
@@ -1983,6 +1994,7 @@
         if (GIMME_V != G_VOID)
           do
             {
+              SV *sv;
               char *offset;
 
               if (!INCR_DONE (self))
@@ -2006,7 +2018,8 @@
                     }
                 }
 
-              XPUSHs (decode_json (self->incr_text, self, &offset));
+              PUTBACK; sv = decode_json (self->incr_text, self, &offset); SPAGAIN;
+              XPUSHs (sv);
 
               self->incr_pos -= offset - SvPVX (self->incr_text);
               self->incr_nest = 0;
@@ -2060,26 +2073,22 @@
 PROTOTYPES: ENABLE
 
 void encode_json (SV *scalar)
-	ALIAS:
-        to_json_    = 0
-        encode_json = F_UTF8
 	PPCODE:
 {
         JSON json;
         json_init (&json);
-        json.flags |= ix;
-        XPUSHs (encode_json (scalar, &json));
+        json.flags |= F_UTF8;
+        PUTBACK; scalar = encode_json (scalar, &json); SPAGAIN;
+        XPUSHs (scalar);
 }
 
 void decode_json (SV *jsonstr)
-	ALIAS:
-        from_json_  = 0
-        decode_json = F_UTF8
 	PPCODE:
 {
         JSON json;
         json_init (&json);
-        json.flags |= ix;
-        XPUSHs (decode_json (jsonstr, &json, 0));
+        json.flags |= F_UTF8;
+        PUTBACK; jsonstr = decode_json (jsonstr, &json, 0); SPAGAIN;
+        XPUSHs (jsonstr);
 }