X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/32874aeac8dacbca26663777b39a79efc5d8dc4b..59f76022ba5d26b64fb06b07c947808ef3457052:/sshzlib.c

diff --git a/sshzlib.c b/sshzlib.c
index 01249535..dc23f5cc 100644
--- a/sshzlib.c
+++ b/sshzlib.c
@@ -40,13 +40,13 @@
 #include <stdlib.h>
 #include <assert.h>
 
-/* FIXME */
-#include <windows.h>
-#include <stdio.h>
-#include "putty.h"
-
 #include "ssh.h"
 
+#ifndef FALSE
+#define FALSE 0
+#define TRUE (!FALSE)
+#endif
+
 /* ----------------------------------------------------------------------
  * Basic LZ77 code. This bit is designed modularly, so it could be
  * ripped out and used in a different LZ77 compressor. Go to it,
@@ -207,6 +207,7 @@ static void lz77_compress(struct LZ77Context *ctx,
     st->npending -= i;
 
     defermatch.len = 0;
+    deferchr = '\0';
     while (len > 0) {
 
 	/* Don't even look for a match, if we're not compressing. */
@@ -519,7 +520,8 @@ static void zlib_match(struct LZ77Context *ectx, int distance, int len)
 	 */
 	i = -1;
 	j = sizeof(lencodes) / sizeof(*lencodes);
-	while (j - i >= 2) {
+	while (1) {
+	    assert(j - i >= 2);
 	    k = (j + i) / 2;
 	    if (thislen < lencodes[k].min)
 		j = k;
@@ -554,7 +556,8 @@ static void zlib_match(struct LZ77Context *ectx, int distance, int len)
 	 */
 	i = -1;
 	j = sizeof(distcodes) / sizeof(*distcodes);
-	while (j - i >= 2) {
+	while (1) {
+	    assert(j - i >= 2);
 	    k = (j + i) / 2;
 	    if (distance < distcodes[k].min)
 		j = k;
@@ -656,7 +659,8 @@ int zlib_compress_block(unsigned char *block, int len,
 	out->firstblock = 0;
 
 	in_block = FALSE;
-    }
+    } else
+	in_block = TRUE;
 
     if (out->comp_disabled) {
 	if (in_block)