From a287a6419f6a5857ecf163ad4bc46a98eb0da8df Mon Sep 17 00:00:00 2001 From: Indev Date: Mon, 23 Feb 2026 22:42:57 +0300 Subject: [PATCH] Use strncpy for zip entry filename because it might not be null-terminated inside zip --- src/w_wad.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/w_wad.c b/src/w_wad.c index 3009d503f..8cc3fd214 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -696,7 +696,8 @@ static lumpinfo_t* ResGetLumpsZip(FILE* handle, UINT16* nlmp) lump_p->size = LONG(zentry->size); fullname = (char*)(malloc(SHORT(zentry->namelen) + 1)); - strlcpy(fullname, (char*)(zentry + 1), SHORT(zentry->namelen) + 1); + strncpy(fullname, (char *)(zentry + 1), SHORT(zentry->namelen)); + fullname[zentry->namelen] = 0; // Strip away file address and extension for the 8char name. if ((trimname = strrchr(fullname, '/')) != NULL) @@ -2237,7 +2238,8 @@ static int W_VerifyPK3(FILE *fp, lumpchecklist_t *checklist, boolean status) if (verified == true) { fullname = (char*)(malloc(SHORT(zentry->namelen) + 1)); - strlcpy(fullname, (char*)(zentry + 1), SHORT(zentry->namelen) + 1); + strncpy(fullname, (char *)(zentry + 1), SHORT(zentry->namelen)); + fullname[zentry->namelen] = 0; // Strip away file address and extension for the 8char name. if ((trimname = strrchr(fullname, '/')) != NULL) @@ -2482,7 +2484,8 @@ static int W_CheckPK3Contains(FILE *fp, lumpchecklist_t *checklist) } fullname = (char*)(malloc(SHORT(zentry->namelen) + 1)); - strlcpy(fullname, (char*)(zentry + 1), SHORT(zentry->namelen) + 1); + strncpy(fullname, (char *)(zentry + 1), SHORT(zentry->namelen)); + fullname[zentry->namelen] = 0; // Strip away file address and extension for the 8char name. if ((trimname = strrchr(fullname, '/')) != NULL)