/* unpack.c -- decompress files in pack format.
- Copyright (C) 1997, 1999, 2006, 2009-2013 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2006, 2009-2018 Free Software Foundation, Inc.
Copyright (C) 1992-1993 Jean-loup Gailly
This program is free software; you can redistribute it and/or modify
/* Restore nodes to be parents+leaves: */
nodes += leaves[len];
}
+ if ((nodes >> 1) != 1)
+ gzip_error ("too few leaves in Huffman tree");
+
/* Construct the prefix table, from shortest leaves to longest ones.
* The shortest code is all ones, so we start at the end of the table.
*/
}
}
/* At this point, peek is the next complete code, of len bits */
- if (peek == eob)
+ if (peek == eob && len == max_len)
break; /* End of file. */
- if (eob < peek)
- gzip_error ("invalid compressed data--code out of range");
put_ubyte(literal[peek+lit_base[len]]);
Tracev((stderr,"%02d %04x %c\n", len, peek,
literal[peek+lit_base[len]]));