reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2025-02-26 21:41:06 +03:00
Code Issues Projects Releases Wiki Activity

net_chan: Cleanup

Browse Source 
Netchan_CopyFileFragments: Fixed a potential possible case to segfault
This commit is contained in:
s1lent 2019-08-11 17:35:27 +07:00
parent 7c5dc890df
commit f01bfdcdcb
No known key found for this signature in database
GPG Key ID: 0FE401DC73916B5C
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rehlds/engine/net_chan.cpp
View File

@ -1525,7 +1525,7 @@ qboolean Netchan_CopyFileFragments(netchan_t *chan)
// TODO: add client name to message // TODO: add client name to message
if (uncompressedSize > 1024 * 64) { if (uncompressedSize > 1024 * 64) {
Con_Printf("Received too large file (size=%u)\nFlushing input queue\n", uncompressedSize); Con_Printf("Received too large file (size=%u)\nFlushing input queue\n", uncompressedSize);
Netchan_FlushIncoming(chan, 1); Netchan_FlushIncoming(chan, FRAG_FILE_STREAM);
return FALSE; return FALSE;
} }
#endif #endif
@ -1533,28 +1533,28 @@ qboolean Netchan_CopyFileFragments(netchan_t *chan)
if (Q_strlen(filename) <= 0) if (Q_strlen(filename) <= 0)
{ {
Con_Printf("File fragment received with no filename\nFlushing input queue\n"); Con_Printf("File fragment received with no filename\nFlushing input queue\n");
Netchan_FlushIncoming(chan, 1); Netchan_FlushIncoming(chan, FRAG_FILE_STREAM);
return FALSE; return FALSE;
} }
if (Q_strstr(filename, "..")) if (Q_strstr(filename, ".."))
{ {
Con_Printf("File fragment received with relative path, ignoring\n"); Con_Printf("File fragment received with relative path, ignoring\n");
Netchan_FlushIncoming(chan, 1); Netchan_FlushIncoming(chan, FRAG_FILE_STREAM);
return FALSE; return FALSE;
} }
if (filename[0] != '!' && !IsSafeFileToDownload(filename)) if (filename[0] != '!' && !IsSafeFileToDownload(filename))
{ {
Con_Printf("File fragment received with bad path, ignoring\n"); Con_Printf("File fragment received with bad path, ignoring\n");
Netchan_FlushIncoming(chan, 1); Netchan_FlushIncoming(chan, FRAG_FILE_STREAM);
return FALSE; return FALSE;
} }
// This prohibits to write files to FS on server // This prohibits to write files to FS on server
if (g_pcls.state == ca_dedicated && filename[0] != '!') if (g_pcls.state == ca_dedicated && filename[0] != '!')
{ {
Con_Printf("File fragment received with bad path, ignoring (2)\n"); Con_Printf("File fragment received with bad path, ignoring (2)\n");
Netchan_FlushIncoming(chan, 1); Netchan_FlushIncoming(chan, FRAG_FILE_STREAM);
return FALSE; return FALSE;
} }
@ -1564,7 +1564,7 @@ qboolean Netchan_CopyFileFragments(netchan_t *chan)
if (filename[0] != '!' && FS_FileExists(filename)) if (filename[0] != '!' && FS_FileExists(filename))
{ {
Con_Printf("Can't download %s, already exists\n", filename); Con_Printf("Can't download %s, already exists\n", filename);
Netchan_FlushIncoming(chan, 1); Netchan_FlushIncoming(chan, FRAG_FILE_STREAM);
return TRUE; return TRUE;
} }
@ -1581,7 +1581,7 @@ qboolean Netchan_CopyFileFragments(netchan_t *chan)
if (!buffer) if (!buffer)
{ {
Con_Printf("Buffer allocation failed on %i bytes\n", nsize + 1); Con_Printf("Buffer allocation failed on %i bytes\n", nsize + 1);
Netchan_FlushIncoming(chan, 1); Netchan_FlushIncoming(chan, FRAG_FILE_STREAM);
return FALSE; return FALSE;
} }
@ -1610,6 +1610,13 @@ qboolean Netchan_CopyFileFragments(netchan_t *chan)
} }
// FIXED: We have concat fragment buffer above, make sure that the fisrt fragment is null
// otherwise we will get memory access violation at next call Netchan_FlushIncoming
#ifdef REHLDS_FIXES
chan->incomingbufs[FRAG_FILE_STREAM] = nullptr;
chan->incomingready[FRAG_FILE_STREAM] = FALSE;
#endif
if (bCompressed) if (bCompressed)
{ {
unsigned char* uncompressedBuffer = (unsigned char*)Mem_Malloc(uncompressedSize); unsigned char* uncompressedBuffer = (unsigned char*)Mem_Malloc(uncompressedSize);
@ -1660,7 +1667,7 @@ qboolean Netchan_CopyFileFragments(netchan_t *chan)
if (!handle) if (!handle)
{ {
Con_Printf("File open failed %s\n", filename); Con_Printf("File open failed %s\n", filename);
Netchan_FlushIncoming(chan, 1); Netchan_FlushIncoming(chan, FRAG_FILE_STREAM);
#ifdef REHLDS_FIXES #ifdef REHLDS_FIXES
Mem_Free(buffer); Mem_Free(buffer);
@ -1675,8 +1682,13 @@ qboolean Netchan_CopyFileFragments(netchan_t *chan)
Mem_Free(buffer); Mem_Free(buffer);
} }
SZ_Clear(&net_message); SZ_Clear(&net_message);
// Moved above
#ifndef REHLDS_FIXES
chan->incomingbufs[FRAG_FILE_STREAM] = nullptr; chan->incomingbufs[FRAG_FILE_STREAM] = nullptr;
chan->incomingready[FRAG_FILE_STREAM] = FALSE; chan->incomingready[FRAG_FILE_STREAM] = FALSE;
#endif
msg_readcount = 0; msg_readcount = 0;
return TRUE; return TRUE;
} }