yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-22 20:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

When opening file make sure it's actually a file, fixes #394

Browse source 
... and not a directory, which can cause crashes.
This commit is contained in:
Daniel Gibson 2019-05-04 19:39:24 +02:00
parent d84bc47766
commit c57befe80d
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/common/header/shared.h
View file

@ -254,13 +254,8 @@ int Q_strlcat(char *dst, const char *src, int size);
/* ============================================= */
/* Unicode wrappers around fopen(). */
#ifdef _WIN32
/* Unicode wrappers that also make sure it's a regular file around fopen(). */
FILE *Q_fopen(const char *file, const char *mode);
#else
#define Q_fopen(file, mode) fopen(file, mode)
#endif
/* ============================================= */

27
src/common/shared/shared.c
View file

@ -1149,7 +1149,9 @@ Q_strlcat(char *dst, const char *src, int size)
*/
#ifdef _WIN32
#include <windows.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
FILE *Q_fopen(const char *file, const char *mode)
{
WCHAR wfile[MAX_OSPATH];
@ -1161,12 +1163,33 @@ FILE *Q_fopen(const char *file, const char *mode)
{
if (MultiByteToWideChar(CP_UTF8, 0, mode, -1, wmode, 16) > 0)
{
return _wfopen(wfile, wmode);
// make sure it's a regular file and not a directory or sth, see #394
struct _stat buf;
int statret = _wstat(wfile, &buf);
if((statret == 0 && (buf.st_mode & _S_IFREG) != 0) || (statret == -1 && errno == ENOENT))
{
return _wfopen(wfile, wmode);
}
}
}
return NULL;
}
#else
#include <sys/stat.h>
#include <errno.h>
FILE *Q_fopen(const char *file, const char *mode)
{
// make sure it's a regular file and not a directory or sth, see #394
struct stat statbuf;
int statret = stat(file, &statbuf);
// (it's ok if it doesn't exist though, maybe we wanna write/create)
if((statret == -1 && errno != ENOENT) || (statret == 0 && (statbuf.st_mode & S_IFREG) == 0))
{
return NULL;
}
return fopen(file, mode);
}
#endif
/*