mirror of https://github.com/madler/zlib
Use z_const for setting msg to literal strings.
This commit is contained in:
parent
c5e87dcdef
commit
2ba25b2dda
|
@ -293,7 +293,7 @@ int ZEXPORT inflateBack9(z_stream FAR *strm, in_func in, void FAR *in_desc,
|
||||||
mode = TABLE;
|
mode = TABLE;
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
strm->msg = (char *)"invalid block type";
|
strm->msg = (z_const char *)"invalid block type";
|
||||||
mode = BAD;
|
mode = BAD;
|
||||||
}
|
}
|
||||||
DROPBITS(2);
|
DROPBITS(2);
|
||||||
|
@ -304,7 +304,7 @@ int ZEXPORT inflateBack9(z_stream FAR *strm, in_func in, void FAR *in_desc,
|
||||||
BYTEBITS(); /* go to byte boundary */
|
BYTEBITS(); /* go to byte boundary */
|
||||||
NEEDBITS(32);
|
NEEDBITS(32);
|
||||||
if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
|
if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
|
||||||
strm->msg = (char *)"invalid stored block lengths";
|
strm->msg = (z_const char *)"invalid stored block lengths";
|
||||||
mode = BAD;
|
mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -341,7 +341,7 @@ int ZEXPORT inflateBack9(z_stream FAR *strm, in_func in, void FAR *in_desc,
|
||||||
state->ncode = BITS(4) + 4;
|
state->ncode = BITS(4) + 4;
|
||||||
DROPBITS(4);
|
DROPBITS(4);
|
||||||
if (state->nlen > 286) {
|
if (state->nlen > 286) {
|
||||||
strm->msg = (char *)"too many length symbols";
|
strm->msg = (z_const char *)"too many length symbols";
|
||||||
mode = BAD;
|
mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -362,7 +362,7 @@ int ZEXPORT inflateBack9(z_stream FAR *strm, in_func in, void FAR *in_desc,
|
||||||
ret = inflate_table9(CODES, state->lens, 19, &(state->next),
|
ret = inflate_table9(CODES, state->lens, 19, &(state->next),
|
||||||
&(lenbits), state->work);
|
&(lenbits), state->work);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
strm->msg = (char *)"invalid code lengths set";
|
strm->msg = (z_const char *)"invalid code lengths set";
|
||||||
mode = BAD;
|
mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -386,7 +386,7 @@ int ZEXPORT inflateBack9(z_stream FAR *strm, in_func in, void FAR *in_desc,
|
||||||
NEEDBITS(here.bits + 2);
|
NEEDBITS(here.bits + 2);
|
||||||
DROPBITS(here.bits);
|
DROPBITS(here.bits);
|
||||||
if (state->have == 0) {
|
if (state->have == 0) {
|
||||||
strm->msg = (char *)"invalid bit length repeat";
|
strm->msg = (z_const char *)"invalid bit length repeat";
|
||||||
mode = BAD;
|
mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -409,7 +409,7 @@ int ZEXPORT inflateBack9(z_stream FAR *strm, in_func in, void FAR *in_desc,
|
||||||
DROPBITS(7);
|
DROPBITS(7);
|
||||||
}
|
}
|
||||||
if (state->have + copy > state->nlen + state->ndist) {
|
if (state->have + copy > state->nlen + state->ndist) {
|
||||||
strm->msg = (char *)"invalid bit length repeat";
|
strm->msg = (z_const char *)"invalid bit length repeat";
|
||||||
mode = BAD;
|
mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -423,7 +423,7 @@ int ZEXPORT inflateBack9(z_stream FAR *strm, in_func in, void FAR *in_desc,
|
||||||
|
|
||||||
/* check for end-of-block code (better have one) */
|
/* check for end-of-block code (better have one) */
|
||||||
if (state->lens[256] == 0) {
|
if (state->lens[256] == 0) {
|
||||||
strm->msg = (char *)"invalid code -- missing end-of-block";
|
strm->msg = (z_const char *)"invalid code -- missing end-of-block";
|
||||||
mode = BAD;
|
mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -437,7 +437,7 @@ int ZEXPORT inflateBack9(z_stream FAR *strm, in_func in, void FAR *in_desc,
|
||||||
ret = inflate_table9(LENS, state->lens, state->nlen,
|
ret = inflate_table9(LENS, state->lens, state->nlen,
|
||||||
&(state->next), &(lenbits), state->work);
|
&(state->next), &(lenbits), state->work);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
strm->msg = (char *)"invalid literal/lengths set";
|
strm->msg = (z_const char *)"invalid literal/lengths set";
|
||||||
mode = BAD;
|
mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -447,7 +447,7 @@ int ZEXPORT inflateBack9(z_stream FAR *strm, in_func in, void FAR *in_desc,
|
||||||
state->ndist, &(state->next), &(distbits),
|
state->ndist, &(state->next), &(distbits),
|
||||||
state->work);
|
state->work);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
strm->msg = (char *)"invalid distances set";
|
strm->msg = (z_const char *)"invalid distances set";
|
||||||
mode = BAD;
|
mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -495,7 +495,7 @@ int ZEXPORT inflateBack9(z_stream FAR *strm, in_func in, void FAR *in_desc,
|
||||||
|
|
||||||
/* invalid code */
|
/* invalid code */
|
||||||
if (here.op & 64) {
|
if (here.op & 64) {
|
||||||
strm->msg = (char *)"invalid literal/length code";
|
strm->msg = (z_const char *)"invalid literal/length code";
|
||||||
mode = BAD;
|
mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -527,7 +527,7 @@ int ZEXPORT inflateBack9(z_stream FAR *strm, in_func in, void FAR *in_desc,
|
||||||
}
|
}
|
||||||
DROPBITS(here.bits);
|
DROPBITS(here.bits);
|
||||||
if (here.op & 64) {
|
if (here.op & 64) {
|
||||||
strm->msg = (char *)"invalid distance code";
|
strm->msg = (z_const char *)"invalid distance code";
|
||||||
mode = BAD;
|
mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -541,7 +541,7 @@ int ZEXPORT inflateBack9(z_stream FAR *strm, in_func in, void FAR *in_desc,
|
||||||
DROPBITS(extra);
|
DROPBITS(extra);
|
||||||
}
|
}
|
||||||
if (offset > WSIZE - (wrap ? 0: left)) {
|
if (offset > WSIZE - (wrap ? 0: left)) {
|
||||||
strm->msg = (char *)"invalid distance too far back";
|
strm->msg = (z_const char *)"invalid distance too far back";
|
||||||
mode = BAD;
|
mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -227,12 +227,12 @@ local int lunpipe(unsigned have, z_const unsigned char *next, struct ind *indp,
|
||||||
if (last == -1)
|
if (last == -1)
|
||||||
return Z_BUF_ERROR;
|
return Z_BUF_ERROR;
|
||||||
if (flags & 0x60) {
|
if (flags & 0x60) {
|
||||||
strm->msg = (char *)"unknown lzw flags set";
|
strm->msg = (z_const char *)"unknown lzw flags set";
|
||||||
return Z_DATA_ERROR;
|
return Z_DATA_ERROR;
|
||||||
}
|
}
|
||||||
max = flags & 0x1f;
|
max = flags & 0x1f;
|
||||||
if (max < 9 || max > 16) {
|
if (max < 9 || max > 16) {
|
||||||
strm->msg = (char *)"lzw bits out of range";
|
strm->msg = (z_const char *)"lzw bits out of range";
|
||||||
return Z_DATA_ERROR;
|
return Z_DATA_ERROR;
|
||||||
}
|
}
|
||||||
if (max == 9) /* 9 doesn't really mean 9 */
|
if (max == 9) /* 9 doesn't really mean 9 */
|
||||||
|
@ -252,7 +252,7 @@ local int lunpipe(unsigned have, z_const unsigned char *next, struct ind *indp,
|
||||||
if (NEXT() == -1) /* missing a bit */
|
if (NEXT() == -1) /* missing a bit */
|
||||||
return Z_BUF_ERROR;
|
return Z_BUF_ERROR;
|
||||||
if (last & 1) { /* code must be < 256 */
|
if (last & 1) { /* code must be < 256 */
|
||||||
strm->msg = (char *)"invalid lzw code";
|
strm->msg = (z_const char *)"invalid lzw code";
|
||||||
return Z_DATA_ERROR;
|
return Z_DATA_ERROR;
|
||||||
}
|
}
|
||||||
rem = (unsigned)last >> 1; /* remaining 7 bits */
|
rem = (unsigned)last >> 1; /* remaining 7 bits */
|
||||||
|
@ -319,7 +319,7 @@ local int lunpipe(unsigned have, z_const unsigned char *next, struct ind *indp,
|
||||||
to detect random or corrupted input after a compress header.
|
to detect random or corrupted input after a compress header.
|
||||||
In any case, the prev > end check must be retained. */
|
In any case, the prev > end check must be retained. */
|
||||||
if (code != end + 1 || prev > end) {
|
if (code != end + 1 || prev > end) {
|
||||||
strm->msg = (char *)"invalid lzw code";
|
strm->msg = (z_const char *)"invalid lzw code";
|
||||||
return Z_DATA_ERROR;
|
return Z_DATA_ERROR;
|
||||||
}
|
}
|
||||||
match[stack++] = (unsigned char)final;
|
match[stack++] = (unsigned char)final;
|
||||||
|
@ -404,7 +404,7 @@ local int gunpipe(z_stream *strm, int infile, int outfile)
|
||||||
break; /* empty gzip stream is ok */
|
break; /* empty gzip stream is ok */
|
||||||
}
|
}
|
||||||
if (last != 31 || (NEXT() != 139 && last != 157)) {
|
if (last != 31 || (NEXT() != 139 && last != 157)) {
|
||||||
strm->msg = (char *)"incorrect header check";
|
strm->msg = (z_const char *)"incorrect header check";
|
||||||
ret = first ? Z_DATA_ERROR : Z_ERRNO;
|
ret = first ? Z_DATA_ERROR : Z_ERRNO;
|
||||||
break; /* not a gzip or compress header */
|
break; /* not a gzip or compress header */
|
||||||
}
|
}
|
||||||
|
@ -420,7 +420,7 @@ local int gunpipe(z_stream *strm, int infile, int outfile)
|
||||||
ret = Z_BUF_ERROR;
|
ret = Z_BUF_ERROR;
|
||||||
if (NEXT() != 8) { /* only deflate method allowed */
|
if (NEXT() != 8) { /* only deflate method allowed */
|
||||||
if (last == -1) break;
|
if (last == -1) break;
|
||||||
strm->msg = (char *)"unknown compression method";
|
strm->msg = (z_const char *)"unknown compression method";
|
||||||
ret = Z_DATA_ERROR;
|
ret = Z_DATA_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -433,7 +433,7 @@ local int gunpipe(z_stream *strm, int infile, int outfile)
|
||||||
NEXT();
|
NEXT();
|
||||||
if (last == -1) break;
|
if (last == -1) break;
|
||||||
if (flags & 0xe0) {
|
if (flags & 0xe0) {
|
||||||
strm->msg = (char *)"unknown header flags set";
|
strm->msg = (z_const char *)"unknown header flags set";
|
||||||
ret = Z_DATA_ERROR;
|
ret = Z_DATA_ERROR;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -486,7 +486,7 @@ local int gunpipe(z_stream *strm, int infile, int outfile)
|
||||||
NEXT() != (int)((outd.crc >> 24) & 0xff)) {
|
NEXT() != (int)((outd.crc >> 24) & 0xff)) {
|
||||||
/* crc error */
|
/* crc error */
|
||||||
if (last != -1) {
|
if (last != -1) {
|
||||||
strm->msg = (char *)"incorrect data check";
|
strm->msg = (z_const char *)"incorrect data check";
|
||||||
ret = Z_DATA_ERROR;
|
ret = Z_DATA_ERROR;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -497,7 +497,7 @@ local int gunpipe(z_stream *strm, int infile, int outfile)
|
||||||
NEXT() != (int)((outd.total >> 24) & 0xff)) {
|
NEXT() != (int)((outd.total >> 24) & 0xff)) {
|
||||||
/* length error */
|
/* length error */
|
||||||
if (last != -1) {
|
if (last != -1) {
|
||||||
strm->msg = (char *)"incorrect length check";
|
strm->msg = (z_const char *)"incorrect length check";
|
||||||
ret = Z_DATA_ERROR;
|
ret = Z_DATA_ERROR;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
24
infback.c
24
infback.c
|
@ -304,7 +304,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
|
||||||
state->mode = TABLE;
|
state->mode = TABLE;
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
strm->msg = (char *)"invalid block type";
|
strm->msg = (z_const char *)"invalid block type";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
}
|
}
|
||||||
DROPBITS(2);
|
DROPBITS(2);
|
||||||
|
@ -315,7 +315,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
|
||||||
BYTEBITS(); /* go to byte boundary */
|
BYTEBITS(); /* go to byte boundary */
|
||||||
NEEDBITS(32);
|
NEEDBITS(32);
|
||||||
if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
|
if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
|
||||||
strm->msg = (char *)"invalid stored block lengths";
|
strm->msg = (z_const char *)"invalid stored block lengths";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -353,7 +353,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
|
||||||
DROPBITS(4);
|
DROPBITS(4);
|
||||||
#ifndef PKZIP_BUG_WORKAROUND
|
#ifndef PKZIP_BUG_WORKAROUND
|
||||||
if (state->nlen > 286 || state->ndist > 30) {
|
if (state->nlen > 286 || state->ndist > 30) {
|
||||||
strm->msg = (char *)"too many length or distance symbols";
|
strm->msg = (z_const char *)"too many length or distance symbols";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -375,7 +375,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
|
||||||
ret = inflate_table(CODES, state->lens, 19, &(state->next),
|
ret = inflate_table(CODES, state->lens, 19, &(state->next),
|
||||||
&(state->lenbits), state->work);
|
&(state->lenbits), state->work);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
strm->msg = (char *)"invalid code lengths set";
|
strm->msg = (z_const char *)"invalid code lengths set";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -398,7 +398,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
|
||||||
NEEDBITS(here.bits + 2);
|
NEEDBITS(here.bits + 2);
|
||||||
DROPBITS(here.bits);
|
DROPBITS(here.bits);
|
||||||
if (state->have == 0) {
|
if (state->have == 0) {
|
||||||
strm->msg = (char *)"invalid bit length repeat";
|
strm->msg = (z_const char *)"invalid bit length repeat";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -421,7 +421,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
|
||||||
DROPBITS(7);
|
DROPBITS(7);
|
||||||
}
|
}
|
||||||
if (state->have + copy > state->nlen + state->ndist) {
|
if (state->have + copy > state->nlen + state->ndist) {
|
||||||
strm->msg = (char *)"invalid bit length repeat";
|
strm->msg = (z_const char *)"invalid bit length repeat";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -435,7 +435,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
|
||||||
|
|
||||||
/* check for end-of-block code (better have one) */
|
/* check for end-of-block code (better have one) */
|
||||||
if (state->lens[256] == 0) {
|
if (state->lens[256] == 0) {
|
||||||
strm->msg = (char *)"invalid code -- missing end-of-block";
|
strm->msg = (z_const char *)"invalid code -- missing end-of-block";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -449,7 +449,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
|
||||||
ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
|
ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
|
||||||
&(state->lenbits), state->work);
|
&(state->lenbits), state->work);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
strm->msg = (char *)"invalid literal/lengths set";
|
strm->msg = (z_const char *)"invalid literal/lengths set";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -458,7 +458,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
|
||||||
ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
|
ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
|
||||||
&(state->next), &(state->distbits), state->work);
|
&(state->next), &(state->distbits), state->work);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
strm->msg = (char *)"invalid distances set";
|
strm->msg = (z_const char *)"invalid distances set";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -517,7 +517,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
|
||||||
|
|
||||||
/* invalid code */
|
/* invalid code */
|
||||||
if (here.op & 64) {
|
if (here.op & 64) {
|
||||||
strm->msg = (char *)"invalid literal/length code";
|
strm->msg = (z_const char *)"invalid literal/length code";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -549,7 +549,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
|
||||||
}
|
}
|
||||||
DROPBITS(here.bits);
|
DROPBITS(here.bits);
|
||||||
if (here.op & 64) {
|
if (here.op & 64) {
|
||||||
strm->msg = (char *)"invalid distance code";
|
strm->msg = (z_const char *)"invalid distance code";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -564,7 +564,7 @@ int ZEXPORT inflateBack(z_streamp strm, in_func in, void FAR *in_desc,
|
||||||
}
|
}
|
||||||
if (state->offset > state->wsize - (state->whave < state->wsize ?
|
if (state->offset > state->wsize - (state->whave < state->wsize ?
|
||||||
left : 0)) {
|
left : 0)) {
|
||||||
strm->msg = (char *)"invalid distance too far back";
|
strm->msg = (z_const char *)"invalid distance too far back";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -155,7 +155,7 @@ void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start) {
|
||||||
dist += (unsigned)hold & ((1U << op) - 1);
|
dist += (unsigned)hold & ((1U << op) - 1);
|
||||||
#ifdef INFLATE_STRICT
|
#ifdef INFLATE_STRICT
|
||||||
if (dist > dmax) {
|
if (dist > dmax) {
|
||||||
strm->msg = (char *)"invalid distance too far back";
|
strm->msg = (z_const char *)"invalid distance too far back";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -169,7 +169,7 @@ void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start) {
|
||||||
if (op > whave) {
|
if (op > whave) {
|
||||||
if (state->sane) {
|
if (state->sane) {
|
||||||
strm->msg =
|
strm->msg =
|
||||||
(char *)"invalid distance too far back";
|
(z_const char *)"invalid distance too far back";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -265,7 +265,7 @@ void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start) {
|
||||||
goto dodist;
|
goto dodist;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
strm->msg = (char *)"invalid distance code";
|
strm->msg = (z_const char *)"invalid distance code";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -280,7 +280,7 @@ void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
strm->msg = (char *)"invalid literal/length code";
|
strm->msg = (z_const char *)"invalid literal/length code";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
42
inflate.c
42
inflate.c
|
@ -642,12 +642,12 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
if (
|
if (
|
||||||
#endif
|
#endif
|
||||||
((BITS(8) << 8) + (hold >> 8)) % 31) {
|
((BITS(8) << 8) + (hold >> 8)) % 31) {
|
||||||
strm->msg = (char *)"incorrect header check";
|
strm->msg = (z_const char *)"incorrect header check";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (BITS(4) != Z_DEFLATED) {
|
if (BITS(4) != Z_DEFLATED) {
|
||||||
strm->msg = (char *)"unknown compression method";
|
strm->msg = (z_const char *)"unknown compression method";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -656,7 +656,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
if (state->wbits == 0)
|
if (state->wbits == 0)
|
||||||
state->wbits = len;
|
state->wbits = len;
|
||||||
if (len > 15 || len > state->wbits) {
|
if (len > 15 || len > state->wbits) {
|
||||||
strm->msg = (char *)"invalid window size";
|
strm->msg = (z_const char *)"invalid window size";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -672,12 +672,12 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
NEEDBITS(16);
|
NEEDBITS(16);
|
||||||
state->flags = (int)(hold);
|
state->flags = (int)(hold);
|
||||||
if ((state->flags & 0xff) != Z_DEFLATED) {
|
if ((state->flags & 0xff) != Z_DEFLATED) {
|
||||||
strm->msg = (char *)"unknown compression method";
|
strm->msg = (z_const char *)"unknown compression method";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (state->flags & 0xe000) {
|
if (state->flags & 0xe000) {
|
||||||
strm->msg = (char *)"unknown header flags set";
|
strm->msg = (z_const char *)"unknown header flags set";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -793,7 +793,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
if (state->flags & 0x0200) {
|
if (state->flags & 0x0200) {
|
||||||
NEEDBITS(16);
|
NEEDBITS(16);
|
||||||
if ((state->wrap & 4) && hold != (state->check & 0xffff)) {
|
if ((state->wrap & 4) && hold != (state->check & 0xffff)) {
|
||||||
strm->msg = (char *)"header crc mismatch";
|
strm->msg = (z_const char *)"header crc mismatch";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -855,7 +855,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
state->mode = TABLE;
|
state->mode = TABLE;
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
strm->msg = (char *)"invalid block type";
|
strm->msg = (z_const char *)"invalid block type";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
}
|
}
|
||||||
DROPBITS(2);
|
DROPBITS(2);
|
||||||
|
@ -864,7 +864,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
BYTEBITS(); /* go to byte boundary */
|
BYTEBITS(); /* go to byte boundary */
|
||||||
NEEDBITS(32);
|
NEEDBITS(32);
|
||||||
if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
|
if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
|
||||||
strm->msg = (char *)"invalid stored block lengths";
|
strm->msg = (z_const char *)"invalid stored block lengths";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -905,7 +905,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
DROPBITS(4);
|
DROPBITS(4);
|
||||||
#ifndef PKZIP_BUG_WORKAROUND
|
#ifndef PKZIP_BUG_WORKAROUND
|
||||||
if (state->nlen > 286 || state->ndist > 30) {
|
if (state->nlen > 286 || state->ndist > 30) {
|
||||||
strm->msg = (char *)"too many length or distance symbols";
|
strm->msg = (z_const char *)"too many length or distance symbols";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -928,7 +928,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
ret = inflate_table(CODES, state->lens, 19, &(state->next),
|
ret = inflate_table(CODES, state->lens, 19, &(state->next),
|
||||||
&(state->lenbits), state->work);
|
&(state->lenbits), state->work);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
strm->msg = (char *)"invalid code lengths set";
|
strm->msg = (z_const char *)"invalid code lengths set";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -952,7 +952,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
NEEDBITS(here.bits + 2);
|
NEEDBITS(here.bits + 2);
|
||||||
DROPBITS(here.bits);
|
DROPBITS(here.bits);
|
||||||
if (state->have == 0) {
|
if (state->have == 0) {
|
||||||
strm->msg = (char *)"invalid bit length repeat";
|
strm->msg = (z_const char *)"invalid bit length repeat";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -975,7 +975,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
DROPBITS(7);
|
DROPBITS(7);
|
||||||
}
|
}
|
||||||
if (state->have + copy > state->nlen + state->ndist) {
|
if (state->have + copy > state->nlen + state->ndist) {
|
||||||
strm->msg = (char *)"invalid bit length repeat";
|
strm->msg = (z_const char *)"invalid bit length repeat";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -989,7 +989,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
|
|
||||||
/* check for end-of-block code (better have one) */
|
/* check for end-of-block code (better have one) */
|
||||||
if (state->lens[256] == 0) {
|
if (state->lens[256] == 0) {
|
||||||
strm->msg = (char *)"invalid code -- missing end-of-block";
|
strm->msg = (z_const char *)"invalid code -- missing end-of-block";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1003,7 +1003,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
|
ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
|
||||||
&(state->lenbits), state->work);
|
&(state->lenbits), state->work);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
strm->msg = (char *)"invalid literal/lengths set";
|
strm->msg = (z_const char *)"invalid literal/lengths set";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1012,7 +1012,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
|
ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
|
||||||
&(state->next), &(state->distbits), state->work);
|
&(state->next), &(state->distbits), state->work);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
strm->msg = (char *)"invalid distances set";
|
strm->msg = (z_const char *)"invalid distances set";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1066,7 +1066,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (here.op & 64) {
|
if (here.op & 64) {
|
||||||
strm->msg = (char *)"invalid literal/length code";
|
strm->msg = (z_const char *)"invalid literal/length code";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1104,7 +1104,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
DROPBITS(here.bits);
|
DROPBITS(here.bits);
|
||||||
state->back += here.bits;
|
state->back += here.bits;
|
||||||
if (here.op & 64) {
|
if (here.op & 64) {
|
||||||
strm->msg = (char *)"invalid distance code";
|
strm->msg = (z_const char *)"invalid distance code";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1121,7 +1121,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
}
|
}
|
||||||
#ifdef INFLATE_STRICT
|
#ifdef INFLATE_STRICT
|
||||||
if (state->offset > state->dmax) {
|
if (state->offset > state->dmax) {
|
||||||
strm->msg = (char *)"invalid distance too far back";
|
strm->msg = (z_const char *)"invalid distance too far back";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1136,7 +1136,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
copy = state->offset - copy;
|
copy = state->offset - copy;
|
||||||
if (copy > state->whave) {
|
if (copy > state->whave) {
|
||||||
if (state->sane) {
|
if (state->sane) {
|
||||||
strm->msg = (char *)"invalid distance too far back";
|
strm->msg = (z_const char *)"invalid distance too far back";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1195,7 +1195,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
state->flags ? hold :
|
state->flags ? hold :
|
||||||
#endif
|
#endif
|
||||||
ZSWAP32(hold)) != state->check) {
|
ZSWAP32(hold)) != state->check) {
|
||||||
strm->msg = (char *)"incorrect data check";
|
strm->msg = (z_const char *)"incorrect data check";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1209,7 +1209,7 @@ int ZEXPORT inflate(z_streamp strm, int flush) {
|
||||||
if (state->wrap && state->flags) {
|
if (state->wrap && state->flags) {
|
||||||
NEEDBITS(32);
|
NEEDBITS(32);
|
||||||
if ((state->wrap & 4) && hold != (state->total & 0xffffffff)) {
|
if ((state->wrap & 4) && hold != (state->total & 0xffffffff)) {
|
||||||
strm->msg = (char *)"incorrect length check";
|
strm->msg = (z_const char *)"incorrect length check";
|
||||||
state->mode = BAD;
|
state->mode = BAD;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue