 @@ -1,15 +1,15 @@
 /* $XFree86: xc/extras/freetype2/src/lzw/zopen.c,v 1.2 2004/12/16 22:15:48 tsi Exp $ */
-/*	$NetBSD: zopen.c,v 1.1.1.1 2005/03/18 13:07:34 tron Exp $	*/
+/*	$NetBSD: zopen.c,v 1.2 2011/08/16 18:17:19 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
 @@ -37,27 +37,27 @@
 /*-
+ *
  * Copyright (c) 2004
  *	Albert Chin-A-Young.
+ *
  * Modified to work with FreeType's PCF driver.
+ *
  */
 #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.1.1.1 2005/03/18 13:07:34 tron Exp $";
+static char rcsid[] = "$NetBSD: zopen.c,v 1.2 2011/08/16 18:17:19 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)
 @@ -204,87 +204,83 @@ zread(s_zstate_t *zs)
 		goto middle;
 	case S_EOF:
 		goto eof;
+	}
 	maxbits = *(zs->next_in);	/* Set -b from file. */
 	zs->avail_in--;
 	zs->next_in++;
 	zs->total_in++;
 	in_count--;
 	block_compress = maxbits & BLOCK_MASK;
 	maxbits &= BIT_MASK;
 	maxmaxcode = 1L << maxbits;
-	if (maxbits > BITS) {
+	if (maxbits > BITS || maxbits < 12) {
 		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. */
 	*(zs->next_out)++ = (unsigned char)finchar;
 	zs->total_out++;
 	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)
+			oldcode = -1;
-				/* O, untimely death! */
+			continue;
 				break;
+		}
 		incode = code;
 		/* 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;
+		}
 		/* Generate output characters in reverse order. */
 		while (code >= 256) {
 			*stackp++ = tab_suffixof(code);
 			code = tab_prefixof(code);
+		}
 		*stackp++ = finchar = tab_suffixof(code);
 		/* And put them out in forward order.  */
 middle:
 		if (stackp == de_stack)
 			continue;
 		do {
 			if (count-- == 0) {
 				return zs->avail_out;
+			}
 			*(zs->next_out)++ = *--stackp;
 			zs->total_out++;
 		} while (stackp > de_stack);
 		/* Generate the new entry. */
-		if ((code = free_ent) < maxmaxcode) {
+		if ((code = free_ent) < maxmaxcode && oldcode != -1) {
 			tab_prefixof(code) = (unsigned short) oldcode;
 			tab_suffixof(code) = finchar;
 			free_ent = code + 1;
+		}
 		/* Remember previous code. */
 		oldcode = incode;
+	}
 	/* state = S_EOF; */
 eof:	return (zs->avail_out - count);
+}
 /*-