#define debug_int(x...) ( fprintf(stderr, x) )
#define debug(x) ( debug_int x )
#else
-#define debug(x)
+#define debug(x) ((void)0)
#endif
#ifdef STANDALONE
{
int i;
- for (i = 0; i < lenof(out->static_len1); i++)
+ for (i = 0; i < (int)lenof(out->static_len1); i++)
out->static_len1[i] = (i < 144 ? 8 :
i < 256 ? 9 :
i < 280 ? 7 : 8);
- for (i = 0; i < lenof(out->static_len2); i++)
+ for (i = 0; i < (int)lenof(out->static_len2); i++)
out->static_len2[i] = 5;
}
hufcodes(out->static_len1, out->static_code1, lenof(out->static_code1));
{
const coderecord *rec;
const unsigned char *block = (const unsigned char *)vblock;
- int code, bfinal, btype, rep, dist, nlen, header, cksum;
+ int code, bfinal, btype, rep, dist, nlen, header;
+ unsigned long cksum;
int error = 0;
if (len == 0) {
*/
if (dctx->nbits < 16)
goto finished;
- nlen = dctx->bits & 0xFFFF;
+ nlen = 0xFFFF & ~dctx->bits;
EATBITS(16);
+ if (dctx->uncomplen != (nlen ^ 0xFFFF)) {
+ error = DEFLATE_ERR_UNCOMP_HDR;
+ goto finished;
+ }
if (dctx->uncomplen == 0)
dctx->state = OUTSIDEBLK; /* block is empty */
else