Mirrors_Framework/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-05-30 05:18:13 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

io: With stdio, only forbid opening directories as files.
Build (All) / Create test plan (push) Has been cancelled
Details
Build (All) / level1 (push) Has been cancelled
Details
Build (All) / level2 (push) Has been cancelled
Details

Browse Source 
This allows opening Unix device nodes, etc.

Fixes #15188.
This commit is contained in:
Ryan C. Gordon
2026-03-12 11:36:42 -04:00
parent 4d675f2bd3
commit 9f19cffc78
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/io/SDL_iostream.c
+11 -14
View File
@@ -970,16 +970,13 @@ static bool SDLCALL mem_close(void *userdata)
#endif #endif
#if defined(HAVE_STDIO_H) && !defined(SKIP_STDIO_DIR_TEST) #if defined(HAVE_STDIO_H) && !defined(SKIP_STDIO_DIR_TEST)
static bool IsRegularFileOrPipe(FILE *f) static bool IsStdioFileADirectory(FILE *f)
{ {
struct stat st; struct stat st;
if (fstat(fileno(f), &st) < 0 || !(S_ISREG(st.st_mode) || S_ISFIFO(st.st_mode))) { return ((fstat(fileno(f), &st) == 0) && (S_ISDIR(st.st_mode)));
return false;
}
return true;
} }
#else #else
#define IsRegularFileOrPipe(f) false #define IsStdioFileADirectory(f) false
#endif #endif
SDL_IOStream *SDL_IOFromFile(const char *file, const char *mode) SDL_IOStream *SDL_IOFromFile(const char *file, const char *mode)
@@ -1001,9 +998,9 @@ SDL_IOStream *SDL_IOFromFile(const char *file, const char *mode)
if (*file == '/') { if (*file == '/') {
FILE *fp = fopen(file, mode); FILE *fp = fopen(file, mode);
if (fp) { if (fp) {
if (!IsRegularFileOrPipe(fp)) { if (IsStdioFileADirectory(fp)) {
fclose(fp); fclose(fp);
SDL_SetError("%s is not a regular file or pipe", file); SDL_SetError("%s is a directory", file);
return NULL; return NULL;
} }
return SDL_IOFromFP(fp, true); return SDL_IOFromFP(fp, true);
@@ -1032,9 +1029,9 @@ SDL_IOStream *SDL_IOFromFile(const char *file, const char *mode)
FILE *fp = fopen(path, mode); FILE *fp = fopen(path, mode);
SDL_free(path); SDL_free(path);
if (fp) { if (fp) {
if (!IsRegularFileOrPipe(fp)) { if (IsStdioFileADirectory(fp)) {
fclose(fp); fclose(fp);
SDL_SetError("%s is not a regular file or pipe", path); SDL_SetError("%s is a directory", path);
return NULL; return NULL;
} }
return SDL_IOFromFP(fp, true); return SDL_IOFromFP(fp, true);
@@ -1098,9 +1095,9 @@ SDL_IOStream *SDL_IOFromFile(const char *file, const char *mode)
if (!fp) { if (!fp) {
SDL_SetError("Couldn't open %s: %s", file, strerror(errno)); SDL_SetError("Couldn't open %s: %s", file, strerror(errno));
} else if (!IsRegularFileOrPipe(fp)) { } else if (IsStdioFileADirectory(fp)) {
fclose(fp); fclose(fp);
SDL_SetError("%s is not a regular file or pipe", file); SDL_SetError("%s is a directory", file);
} else { } else {
iostr = SDL_IOFromFP(fp, true); iostr = SDL_IOFromFP(fp, true);
} }
@@ -1121,9 +1118,9 @@ SDL_IOStream *SDL_IOFromFile(const char *file, const char *mode)
if (!fp) { if (!fp) {
SDL_SetError("Couldn't open %s: %s", file, strerror(errno)); SDL_SetError("Couldn't open %s: %s", file, strerror(errno));
} else if (!IsRegularFileOrPipe(fp)) { } else if (IsStdioFileADirectory(fp)) {
fclose(fp); fclose(fp);
SDL_SetError("%s is not a regular file or pipe", file); SDL_SetError("%s is a directory", file);
} else { } else {
iostr = SDL_IOFromFP(fp, true); iostr = SDL_IOFromFP(fp, true);
} }