From 00d75840b662931efcca5f464dd98a4bdfbb7382 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Mon, 18 Jun 2018 12:49:06 +0100
Subject: [PATCH] Not necessary on-topic devwork, but using global variables I
developed in internal to make there less code repetition/iteration in the WAD
limit checks.
---
src/d_netcmd.c | 36 +++++++-----------------------------
src/d_netfil.c | 9 ++-------
src/w_wad.c | 4 +---
3 files changed, 10 insertions(+), 39 deletions(-)
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index e011781557..89f01c161c 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -3081,26 +3081,14 @@ static void Command_Addfile(void)
if (*p == '\\' || *p == '/' || *p == ':')
break;
++p;
+
// check total packet size and no of files currently loaded
+ // See W_LoadWadFile in w_wad.c
+ if ((numwadfiles >= MAX_WADFILES)
+ || ((packetsizetally + nameonlylength(fn) + 22) > MAXFILENEEDED*sizeof(UINT8)))
{
- size_t packetsize = 0;
- serverinfo_pak *dummycheck = NULL;
-
- // Shut the compiler up.
- (void)dummycheck;
-
- // See W_LoadWadFile in w_wad.c
- for (i = 0; i < numwadfiles; i++)
- packetsize += nameonlylength(wadfiles[i]->filename) + 22;
-
- packetsize += nameonlylength(fn) + 22;
-
- if ((numwadfiles >= MAX_WADFILES)
- || (packetsize > sizeof(dummycheck->fileneeded)))
- {
- CONS_Alert(CONS_ERROR, M_GetText("Too many files loaded to add %s\n"), fn);
- return;
- }
+ CONS_Alert(CONS_ERROR, M_GetText("Too many files loaded to add %s\n"), fn);
+ return;
}
WRITESTRINGN(buf_p,p,240);
@@ -3150,11 +3138,6 @@ static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
boolean kick = false;
boolean toomany = false;
INT32 i;
- size_t packetsize = 0;
- serverinfo_pak *dummycheck = NULL;
-
- // Shut the compiler up.
- (void)dummycheck;
READSTRINGN(*cp, filename, 240);
READMEM(*cp, md5sum, 16);
@@ -3181,13 +3164,8 @@ static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
}
// See W_LoadWadFile in w_wad.c
- for (i = 0; i < numwadfiles; i++)
- packetsize += nameonlylength(wadfiles[i]->filename) + 22;
-
- packetsize += nameonlylength(filename) + 22;
-
if ((numwadfiles >= MAX_WADFILES)
- || (packetsize > sizeof(dummycheck->fileneeded)))
+ || ((packetsizetally + nameonlylength(filename) + 22) > MAXFILENEEDED*sizeof(UINT8)))
toomany = true;
else
ncs = findfile(filename,md5sum,true);
diff --git a/src/d_netfil.c b/src/d_netfil.c
index 889de94667..ea95153b95 100644
--- a/src/d_netfil.c
+++ b/src/d_netfil.c
@@ -324,10 +324,6 @@ INT32 CL_CheckFiles(void)
INT32 ret = 1;
size_t packetsize = 0;
size_t filestoget = 0;
- serverinfo_pak *dummycheck = NULL;
-
- // Shut the compiler up.
- (void)dummycheck;
// if (M_CheckParm("-nofiles"))
// return 1;
@@ -371,8 +367,7 @@ INT32 CL_CheckFiles(void)
}
// See W_LoadWadFile in w_wad.c
- for (i = 0; i < numwadfiles; i++)
- packetsize += nameonlylength(wadfiles[i]->filename) + 22;
+ packetsize = packetsizetally;
for (i = 1; i < fileneedednum; i++)
{
@@ -396,7 +391,7 @@ INT32 CL_CheckFiles(void)
packetsize += nameonlylength(fileneeded[i].filename) + 22;
if ((numwadfiles+filestoget >= MAX_WADFILES)
- || (packetsize > sizeof(dummycheck->fileneeded)))
+ || (packetsize > MAXFILENEEDED*sizeof(UINT8)))
return 3;
filestoget++;
diff --git a/src/w_wad.c b/src/w_wad.c
index 1b0e501a63..46caef8477 100644
--- a/src/w_wad.c
+++ b/src/w_wad.c
@@ -360,9 +360,7 @@ UINT16 W_InitFile(const char *filename)
// see PutFileNeeded in d_netfil.c
if ((important = !W_VerifyNMUSlumps(filename)))
{
- packetsize = packetsizetally;
-
- packetsize += nameonlylength(filename) + 22;
+ packetsize = packetsizetally + nameonlylength(filename) + 22;
if (packetsize > MAXFILENEEDED*sizeof(UINT8))
{
--
GitLab