reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2025-02-27 14:01:18 +03:00
Code Issues Projects Releases Wiki Activity

Host_Motd_f: Fixed viewing motd when motdfile is not specified

Browse Source
This commit is contained in:
s1lentq 2023-09-20 20:20:14 +07:00
parent 2ba27d409c
commit de3679f039
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rehlds/engine/common.cpp
View File

@ -1978,6 +1978,34 @@ NOXREF int COM_ExpandFilename(char *filename)
return *filename != 0;
}
// small helper function shared by lots of modules
qboolean COM_IsAbsolutePath(const char *pStr)
{
if (strchr(pStr, ':') || pStr[0] == '/' || pStr[0] == '\\')
return FALSE;
return TRUE;
}
qboolean COM_IsValidPath(const char *pszFilename)
{
if (!pszFilename)
return FALSE;
if (Q_strlen(pszFilename) <= 0 ||
Q_strstr(pszFilename, "\\\\") || // to protect network paths
Q_strstr(pszFilename, ":") || // to protect absolute paths
Q_strstr(pszFilename, "..") || // to protect relative paths
Q_strstr(pszFilename, "~") ||
Q_strstr(pszFilename, "\n") || // CFileSystem_Stdio::FS_fopen doesn't allow this
Q_strstr(pszFilename, "\r")) // CFileSystem_Stdio::FS_fopen doesn't allow this
{
return FALSE;
}
return TRUE;
}
int EXT_FUNC COM_FileSize(const char *filename)
{
FileHandle_t fp;

2
rehlds/engine/common.h
View File

@ -187,6 +187,8 @@ void COM_CreatePath(char *path);
NOXREF void COM_CopyFile(char *netpath, char *cachepath);
NOXREF int COM_ExpandFilename(char *filename);
int COM_FileSize(const char *filename);
qboolean COM_IsAbsolutePath(const char *pStr);
qboolean COM_IsValidPath(const char *pszFilename);
unsigned char *COM_LoadFile(const char *path, int usehunk, int *pLength);
void COM_FreeFile(void *buffer);
void COM_CopyFileChunk(FileHandle_t dst, FileHandle_t src, int nSize);

10
rehlds/engine/host_cmd.cpp
View File

@ -205,11 +205,19 @@ void Host_Motd_f(void)
char *next;
pFileList = motdfile.string;
if (*pFileList == '/' || Q_strstr(pFileList, ":") || Q_strstr(pFileList, "..") || Q_strstr(pFileList, "\\"))
if (!COM_IsValidPath(pFileList) || COM_IsAbsolutePath(pFileList))
{
Con_Printf("Unable to open %s (contains illegal characters)\n", pFileList);
return;
}
const char *pchExtension = COM_FileExtension(pFileList);
if (Q_stricmp(pchExtension, "txt") != 0)
{
Con_Printf("Invalid motdfile name %s (wrong file extension, must be .txt)\n", pFileList);
return;
}
pFile = FS_Open(pFileList, "rb");
if (!pFile)
{