--- JSON-XS/XS.xs	2007/03/23 15:57:18	1.7
+++ JSON-XS/XS.xs	2007/03/23 16:13:59	1.8
@@ -319,16 +319,20 @@
             qsort (hes, count, sizeof (HE *), he_cmp_fast);
           else
             {
-              // hack to disable "use bytes"
-              COP *oldcop = PL_curcop, cop;
+              // hack to forcefully disable "use bytes"
+              COP cop = *PL_curcop;
               cop.op_private = 0;
-              PL_curcop = &cop;
 
+              ENTER;
               SAVETMPS;
+
+              SAVEVPTR (PL_curcop);
+              PL_curcop = &cop;
+
               qsort (hes, count, sizeof (HE *), he_cmp_slow);
-              FREETMPS;
 
-              PL_curcop = oldcop;
+              FREETMPS;
+              LEAVE;
             }
 
           for (i = 0; i < count; ++i)
@@ -880,14 +884,16 @@
                   ? dec.cur - SvPVX (string)
                   : utf8_distance (dec.cur, SvPVX (string));
       SV *uni = sv_newmortal ();
+
       // horrible hack to silence warning inside pv_uni_display
-      COP cop;
-      memset (&cop, 0, sizeof (cop));
+      COP cop = *PL_curcop;
       cop.cop_warnings = pWARN_NONE;
+      ENTER;
       SAVEVPTR (PL_curcop);
       PL_curcop = &cop;
-
       pv_uni_display (uni, dec.cur, dec.end - dec.cur, 20, UNI_DISPLAY_QQ);
+      LEAVE;
+
       croak ("%s, at character offset %d (%s)",
              dec.err,
              (int)offset,