 @@ -1,14 +1,14 @@
-/*	$NetBSD: zopen.c,v 1.14 2011/08/16 03:24:47 christos Exp $	*/
+/*	$NetBSD: zopen.c,v 1.15 2011/08/16 13:55:01 joerg Exp $	*/
 /*-
  * Copyright (c) 1985, 1986, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Diomidis Spinellis and James A. Woods, derived from original
  * work by Spencer Thomas and Joseph Orost.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -27,27 +27,27 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)zopen.c	8.1 (Berkeley) 6/27/93";
 #else
-static char rcsid[] = "$NetBSD: zopen.c,v 1.14 2011/08/16 03:24:47 christos Exp $";
+static char rcsid[] = "$NetBSD: zopen.c,v 1.15 2011/08/16 13:55:01 joerg Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 /*-
  * fcompress.c - File compression ala IEEE Computer, June 1984.
+ *
  * Compress authors:
  *		Spencer W. Thomas	(decvax!utah-cs!thomas)
  *		Jim McKie		(decvax!mcvax!jim)
  *		Steve Davies		(decvax!vax135!petsd!peora!srd)
  *		Ken Turkowski		(decvax!decwrl!turtlevax!ken)
  *		James A. Woods		(decvax!ihnp4!ames!jaw)
  *		Joe Orost		(decvax!vax135!petsd!joe)
 @@ -476,85 +476,85 @@ zread(void *cookie, char *rbp, int num)
+	}
 	/* Check the magic number */
 	if (fread(header,
 	    sizeof(char), sizeof(header), fp) != sizeof(header) ||
 	    memcmp(header, magic_header, sizeof(magic_header)) != 0) {
 		errno = EFTYPE;
 		return (-1);
+	}
 	maxbits = header[2];	/* Set -b from file. */
 	block_compress = maxbits & BLOCK_MASK;
 	maxbits &= BIT_MASK;
 	maxmaxcode = 1L << maxbits;
-	if (maxbits > BITS) {
+	if (maxbits > BITS || maxbits < 12) {
 		errno = EFTYPE;
 		return (-1);
+	}
 	/* As above, initialize the first 256 entries in the table. */
 	maxcode = MAXCODE(n_bits = INIT_BITS);
 	for (code = 255; code >= 0; code--) {
 		tab_prefixof(code) = 0;
 		tab_suffixof(code) = (char_type) code;
+	}
 	free_ent = block_compress ? FIRST : 256;
 	oldcode = -1;
 	finchar = oldcode = getcode(zs);
 	if (oldcode == -1)	/* EOF already? */
 		return (0);	/* Get out of here */
 	/* First code must be 8 bits = char. */
 	*bp++ = (u_char)finchar;
 	count--;
 	stackp = de_stack;
 	while ((code = getcode(zs)) > -1) {
 		if ((code == CLEAR) && block_compress) {
 			for (code = 255; code >= 0; code--)
 				tab_prefixof(code) = 0;
 			clear_flg = 1;
-			free_ent = FIRST - 1;
+			free_ent = FIRST;
-			if ((code = getcode(zs)) == -1)	/* O, untimely death! */
+			oldcode = -1;
-				break;
+			continue;
+		}
 		incode = code;
-		/* Special case FOR kWkWk string. */
+		/* Special case for kWkWk string. */
 		if (code >= free_ent) {
 			if (code > free_ent || oldcode == -1) {
 				/* Bad stream. */
 				errno = EINVAL;
 				return (-1);
+			}
 			*stackp++ = finchar;
 			code = oldcode;
+		}
 		/*
 		 * The above condition ensures that code < free_ent.
 		 * The construction of tab_prefixof in turn guarantees that
 		 * each iteration decreases code and therefore stack usage is
 		 * bound by 1 << BITS - 256.
 		 */
 		/* Generate output characters in reverse order. */
 		while (code >= 256) {
 			if (stackp - de_stack >= HSIZE - 1) {
 				errno = EOVERFLOW;
 				return -1;
 			*stackp++ = tab_suffixof(code);
 			code = tab_prefixof(code);
+		}
 		*stackp++ = finchar = tab_suffixof(code);
 		/* And put them out in forward order.  */
 middle:		do {
 			if (count-- == 0)
 				return (num);
 			*bp++ = *--stackp;
 		} while (stackp > de_stack);
 		/* Generate the new entry. */
-		if ((code = free_ent) < maxmaxcode) {
+		if ((code = free_ent) < maxmaxcode && oldcode != -1) {
 			tab_prefixof(code) = (u_short) oldcode;
 			tab_suffixof(code) = finchar;
 			free_ent = code + 1;
+		}
 		/* Remember previous code. */
 		oldcode = incode;
+	}
 	state = S_EOF;
 eof:	return (num - count);
+}
 /*-

 @@ -1,14 +1,14 @@
-/*	$NetBSD: zuncompress.c,v 1.10 2011/08/16 03:25:34 christos Exp $ */
+/*	$NetBSD: zuncompress.c,v 1.11 2011/08/16 13:55:02 joerg Exp $ */
 /*-
  * Copyright (c) 1985, 1986, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Diomidis Spinellis and James A. Woods, derived from original
  * work by Spencer Thomas and Joseph Orost.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -236,86 +236,89 @@ zread(void *cookie, char *rbp, int num)
 		header[i] = *compressed_pre++;
 	if (fread(header + i, 1, sizeof(header) - i, zs->zs_fp) !=
 		  sizeof(header) - i ||
 	    memcmp(header, magic_header, sizeof(magic_header)) != 0) {
 		errno = EFTYPE;
 		return (-1);
+	}
 	total_compressed_bytes = 0;
 	zs->zs_maxbits = header[2];	/* Set -b from file. */
 	zs->zs_block_compress = zs->zs_maxbits & BLOCK_MASK;
 	zs->zs_maxbits &= BIT_MASK;
 	zs->zs_maxmaxcode = 1L << zs->zs_maxbits;
-	if (zs->zs_maxbits > BITS) {
+	if (zs->zs_maxbits > BITS || zs->zs_maxbits < 12) {
 		errno = EFTYPE;
 		return (-1);
+	}
 	/* As above, initialize the first 256 entries in the table. */
 	zs->zs_maxcode = MAXCODE(zs->zs_n_bits = INIT_BITS);
 	for (zs->u.r.zs_code = 255; zs->u.r.zs_code >= 0; zs->u.r.zs_code--) {
 		tab_prefixof(zs->u.r.zs_code) = 0;
 		tab_suffixof(zs->u.r.zs_code) = (char_type) zs->u.r.zs_code;
+	}
 	zs->zs_free_ent = zs->zs_block_compress ? FIRST : 256;
-	zs->u.r.zs_finchar = zs->u.r.zs_oldcode = getcode(zs);
+	zs->u.r.zs_oldcode = -1;
 	if (zs->u.r.zs_oldcode == -1)	/* EOF already? */
 		return (0);	/* Get out of here */
 	/* First code must be 8 bits = char. */
 	*bp++ = (u_char)zs->u.r.zs_finchar;
 	count--;
 	zs->u.r.zs_stackp = de_stack;
 	while ((zs->u.r.zs_code = getcode(zs)) > -1) {
 		if ((zs->u.r.zs_code == CLEAR) && zs->zs_block_compress) {
 			for (zs->u.r.zs_code = 255; zs->u.r.zs_code >= 0;
 			    zs->u.r.zs_code--)
 				tab_prefixof(zs->u.r.zs_code) = 0;
 			zs->zs_clear_flg = 1;
-			zs->zs_free_ent = FIRST - 1;
+			zs->zs_free_ent = FIRST;
-			if ((zs->u.r.zs_code = getcode(zs)) == -1)	/* O, untimely death! */
+			zs->u.r.zs_oldcode = -1;
-				break;
+			continue;
+		}
 		zs->u.r.zs_incode = zs->u.r.zs_code;
 		/* Special case for KwKwK string. */
 		if (zs->u.r.zs_code >= zs->zs_free_ent) {
 			if (zs->u.r.zs_code > zs->zs_free_ent ||
 			    zs->u.r.zs_oldcode == -1) {
 				/* Bad stream. */
 				errno = EINVAL;
 				return (-1);
+			}
 			*zs->u.r.zs_stackp++ = zs->u.r.zs_finchar;
 			zs->u.r.zs_code = zs->u.r.zs_oldcode;
+		}
 		/*
 		 * The above condition ensures that code < free_ent.
 		 * The construction of tab_prefixof in turn guarantees that
 		 * each iteration decreases code and therefore stack usage is
 		 * bound by 1 << BITS - 256.
 		 */
 		/* Generate output characters in reverse order. */
 		while (zs->u.r.zs_code >= 256) {
 			if (zs->u.r.zs_stackp - de_stack >= HSIZE - 1) {
 				errno = EOVERFLOW;
 				return -1;
 			*zs->u.r.zs_stackp++ = tab_suffixof(zs->u.r.zs_code);
 			zs->u.r.zs_code = tab_prefixof(zs->u.r.zs_code);
+		}
 		*zs->u.r.zs_stackp++ = zs->u.r.zs_finchar = tab_suffixof(zs->u.r.zs_code);
 		/* And put them out in forward order.  */
 middle:		do {
 			if (count-- == 0)
 				return (num);
 			*bp++ = *--zs->u.r.zs_stackp;
 		} while (zs->u.r.zs_stackp > de_stack);
 		/* Generate the new entry. */
-		if ((zs->u.r.zs_code = zs->zs_free_ent) < zs->zs_maxmaxcode) {
+		if ((zs->u.r.zs_code = zs->zs_free_ent) < zs->zs_maxmaxcode &&
 		    zs->u.r.zs_oldcode != -1) {
 			tab_prefixof(zs->u.r.zs_code) = (u_short) zs->u.r.zs_oldcode;
 			tab_suffixof(zs->u.r.zs_code) = zs->u.r.zs_finchar;
 			zs->zs_free_ent = zs->u.r.zs_code + 1;
+		}
 		/* Remember previous code. */
 		zs->u.r.zs_oldcode = zs->u.r.zs_incode;
+	}
 	zs->zs_state = S_EOF;
 eof:	return (num - count);
+}
 /*-