--- Compress-LZF/LZF.xs	2006/07/07 15:47:10	1.20
+++ Compress-LZF/LZF.xs	2007/04/16 20:05:33	1.24
@@ -2,17 +2,8 @@
 #include "perl.h"
 #include "XSUB.h"
 
-/* try to be compatible with older perls */
-/* SvPV_nolen() macro first defined in 5.005_55 */
-/* this is slow, not threadsafe, but works */
-#include "patchlevel.h"
-#if (PATCHLEVEL == 4) || ((PATCHLEVEL == 5) && (SUBVERSION < 55))
-static STRLEN nolen_na;
-# define SvPV_nolen(sv) SvPV ((sv), nolen_na)
-#endif
-#if PATCHLEVEL < 6
-# define call_sv perl_call_sv
-#endif
+#define LZF_STANDALONE 1
+#define LZF_STATE_ARG 1
 
 #include "lzf_c.c"
 #include "lzf_d.c"
@@ -43,8 +34,9 @@
 static SV *
 compress_sv (SV *data, char cprepend, int uprepend)
 {
+  LZF_STATE *state;
   STRLEN usize, csize;
-  char *src = (char *)SvPV (data, usize);
+  char *src = (char *)SvPVbyte (data, usize);
 
   if (usize)
     {
@@ -100,11 +92,15 @@
       else
         croak ("compress can only compress up to %ld bytes", 0x7fffffffL);
 
+      New (0, state, 1, LZF_STATE);
+      if (!state)
+        croak ("Compress::LZF unable to allocate memory for compression state");
+
       /* 11 bytes is the smallest compressible string */
       csize = usize < 11 ? 0 :
-              lzf_compress (src, usize,
-                                  dst + skip,
-                                  usize - skip);
+              lzf_compress (src, usize, dst + skip, usize - skip, *state);
+
+      Safefree (state);
 
       if (csize)
         {
@@ -134,7 +130,7 @@
 decompress_sv (SV *data, int skip)
 {
   STRLEN usize, csize;
-  unsigned char *src = (unsigned char *)SvPV (data, csize) + skip;
+  unsigned char *src = (unsigned char *)SvPVbyte (data, csize) + skip;
 
   if (csize)
     {
@@ -145,25 +141,25 @@
 
       if (src[0])
         {
-          if (!(src[0] & 0x80))
+          if (!(src[0] & 0x80) && csize >= 1)
             {
               csize -= 1;
               usize =                 *src++ & 0xff;
             }
-          else if (!(src[0] & 0x20))
+          else if (!(src[0] & 0x20) && csize >= 2)
             {
               csize -= 2;
               usize =                 *src++ & 0x1f;
               usize = (usize << 6) | (*src++ & 0x3f);
             }
-          else if (!(src[0] & 0x10))
+          else if (!(src[0] & 0x10) && csize >= 3)
             {
               csize -= 3;
               usize =                 *src++ & 0x0f;
               usize = (usize << 6) | (*src++ & 0x3f);
               usize = (usize << 6) | (*src++ & 0x3f);
             }
-          else if (!(src[0] & 0x08))
+          else if (!(src[0] & 0x08) && csize >= 4)
             {
               csize -= 4;
               usize =                 *src++ & 0x07;
@@ -171,7 +167,7 @@
               usize = (usize << 6) | (*src++ & 0x3f);
               usize = (usize << 6) | (*src++ & 0x3f);
             }
-          else if (!(src[0] & 0x04))
+          else if (!(src[0] & 0x04) && csize >= 5)
             {
               csize -= 5;
               usize =                 *src++ & 0x03;
@@ -180,7 +176,7 @@
               usize = (usize << 6) | (*src++ & 0x3f);
               usize = (usize << 6) | (*src++ & 0x3f);
             }
-          else if (!(src[0] & 0x02))
+          else if (!(src[0] & 0x02) && csize >= 6)
             {
               csize -= 6;
               usize =                 *src++ & 0x01;
@@ -192,18 +188,24 @@
             }
           else
             croak ("compressed data corrupted (invalid length)");
+
+          if (!usize)
+            croak ("compressed data corrupted (invalid length)");
                     
           ret = NEWSV (0, usize);
           SvPOK_only (ret);
           dst = SvPVX (ret);
 
           if (lzf_decompress (src, csize, dst, usize) != usize)
-            croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
+            {
+              SvREFCNT_dec (ret);
+              croak ("compressed data corrupted (size mismatch)", csize, skip, usize);
+            }
         }
       else
         {
           usize = csize - 1;
-          ret = NEWSV (0, usize);
+          ret = NEWSV (0, usize | 1);
           SvPOK_only (ret);
 
           Move ((void *)(src + 1), (void *)SvPVX (ret), usize, unsigned char);
@@ -220,16 +222,10 @@
 static void
 need_storable(void)
 {
-#if PATCHLEVEL < 6
-  char req[8192];
-  sprintf (req, "require %s;", SvPV_nolen (serializer_package));
-  perl_eval_pv (req, 1);
-#else
   load_module (PERL_LOADMOD_NOIMPORT, serializer_package, Nullsv);
-#endif
 
-  storable_mstore    = GvCV (gv_fetchpv (SvPV_nolen (serializer_mstore   ), TRUE, SVt_PVCV));
-  storable_mretrieve = GvCV (gv_fetchpv (SvPV_nolen (serializer_mretrieve), TRUE, SVt_PVCV));
+  storable_mstore    = GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mstore   ), TRUE, SVt_PVCV));
+  storable_mretrieve = GvCV (gv_fetchpv (SvPVbyte_nolen (serializer_mretrieve), TRUE, SVt_PVCV));
 }
 
 MODULE = Compress::LZF   PACKAGE = Compress::LZF
@@ -280,12 +276,13 @@
         if (!SvOK (sv))
           XPUSHs (sv_2mortal (newSVpvn ("\02", 1))); /* 02 == MAGIC_undef */
         else if (SvROK (sv)
-              || (SvTYPE(sv) != SVt_IV
-                 && SvTYPE(sv) != SVt_NV
-                 && SvTYPE(sv) != SVt_PV
-                 && SvTYPE(sv) != SVt_PVIV
-                 && SvTYPE(sv) != SVt_PVNV
-                 && SvTYPE(sv) != SVt_PVMG)) /* mstore */
+                 || SvUTF8 (sv)
+                 || (SvTYPE(sv) != SVt_IV
+                     && SvTYPE(sv) != SVt_NV
+                     && SvTYPE(sv) != SVt_PV
+                     && SvTYPE(sv) != SVt_PVIV
+                     && SvTYPE(sv) != SVt_PVNV
+                     && SvTYPE(sv) != SVt_PVMG)) /* mstore */
           {
             int deref = !SvROK (sv);
 
@@ -349,7 +346,7 @@
         int deref = 0;
 
         SvGETMAGIC (sv);
-        if (SvPOK (sv) && IN_RANGE (SvPV (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
+        if (SvPOK (sv) && IN_RANGE (SvPVbyte (sv, svlen)[0], MAGIC_LO, MAGIC_HI))
           {
             redo: