sync with OpenBSD -current

This commit is contained in:
purplerain 2024-06-30 16:44:16 +00:00
parent aaa686b79e
commit 1093aeaee4
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
25 changed files with 7769 additions and 280 deletions

View file

@ -155,7 +155,7 @@ void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start) {
dist += (unsigned)hold & ((1U << op) - 1);
#ifdef INFLATE_STRICT
if (dist > dmax) {
strm->msg = (char *)"invalid distance too far back";
strm->msg = (z_const char *)"invalid distance too far back";
state->mode = BAD;
break;
}
@ -169,10 +169,10 @@ void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start) {
if (op > whave) {
if (state->sane) {
#ifdef SMALL
strm->msg = "error";
strm->msg = (z_const char *)"error";
#else
strm->msg =
(char *)"invalid distance too far back";
(z_const char *)"invalid distance too far back";
#endif
state->mode = BAD;
break;
@ -270,9 +270,9 @@ void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start) {
}
else {
#ifdef SMALL
strm->msg = "error";
strm->msg = (z_const char *)"error";
#else
strm->msg = (char *)"invalid distance code";
strm->msg = (z_const char *)"invalid distance code";
#endif
state->mode = BAD;
break;
@ -289,9 +289,9 @@ void ZLIB_INTERNAL inflate_fast(z_streamp strm, unsigned start) {
}
else {
#ifdef SMALL
strm->msg = "error";
strm->msg = (z_const char *)"error";
#else
strm->msg = (char *)"invalid literal/length code";
strm->msg = (z_const char *)"invalid literal/length code";
#endif
state->mode = BAD;
break;