2 files changed, 4 insertions, 2 deletions
diff --git a/Changes b/Changes
index 7e6b7e6..429bb62 100644
--- a/Changes
+++ b/Changes
@@ -10,6 +10,7 @@
           3-15% faster than fastlz while still maintaining a similar ratio.
           (amd64 and core 2 duo, ymmv). thanks a lot for the competition :)
         - undo inline assembly, it is no longer helpful.
+        - no changes to the decompressor.
 
 2.1  Fri Nov  2 13:34:42 CET 2007
 	- switched to a 2-clause bsd license with GPL exception.
diff --git a/lzf_c.c b/lzf_c.c
index 98371c5..bf86f1d 100644
--- a/lzf_c.c
+++ b/lzf_c.c
@@ -256,7 +256,7 @@ lzf_compress (const void *const in_data, unsigned int in_len,
         }
     }
 
-  if (op + lit + 2 >= out_end)
+  if (op + 2 >= out_end)
     return 0;
 
   while (ip < in_end)
@@ -265,7 +265,8 @@ lzf_compress (const void *const in_data, unsigned int in_len,
       *op++ = *ip++;
     }
 
-  op [- lit - 1] = lit - 1;
+  op [- lit - 1] = lit - 1; /* end run */
+  op -= !lit; /* undo run if length is zero */
 
   return op - (u8 *)out_data;
 }