Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2025-03-14 21:37:02 +08:00
45 changed files with 2300 additions and 269 deletions

5
deps/zlib/inflate.c vendored
View File

@@ -763,9 +763,10 @@ int flush;
copy = state->length;
if (copy > have) copy = have;
if (copy) {
len = state->head->extra_len - state->length;
if (state->head != Z_NULL &&
state->head->extra != Z_NULL) {
len = state->head->extra_len - state->length;
state->head->extra != Z_NULL &&
len < state->head->extra_max) {
zmemcpy(state->head->extra + len, next,
len + copy > state->head->extra_max ?
state->head->extra_max - len : copy);