--- Compress-LZF/LZF.xs	2006/07/07 15:47:10	1.20
+++ Compress-LZF/LZF.xs	2007/02/16 22:11:17	1.23
@@ -14,6 +14,9 @@
 # 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,6 +46,7 @@
 static SV *
 compress_sv (SV *data, char cprepend, int uprepend)
 {
+  LZF_STATE *state;
   STRLEN usize, csize;
   char *src = (char *)SvPV (data, usize);
 
@@ -100,11 +104,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)
         {
@@ -145,25 +153,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 +179,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 +188,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 +200,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);