diff options
Diffstat (limited to 'src/os/unix')
| -rw-r--r-- | src/os/unix/unix.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/os/unix/unix.cpp b/src/os/unix/unix.cpp index a9b81e62c..44b27bbad 100644 --- a/src/os/unix/unix.cpp +++ b/src/os/unix/unix.cpp @@ -92,17 +92,20 @@ bool FiosGetDiskFreeSpace(const char *path, uint64 *tot) bool FiosIsValidFile(const char *path, const struct dirent *ent, struct stat *sb) { char filename[MAX_PATH]; - + int res; #if defined(__MORPHOS__) || defined(__AMIGAOS__) /* On MorphOS or AmigaOS paths look like: "Volume:directory/subdirectory" */ if (FiosIsRoot(path)) { - snprintf(filename, lengthof(filename), "%s:%s", path, ent->d_name); + res = snprintf(filename, lengthof(filename), "%s:%s", path, ent->d_name); } else // XXX - only next line! #else assert(path[strlen(path) - 1] == PATHSEPCHAR); if (strlen(path) > 2) assert(path[strlen(path) - 2] != PATHSEPCHAR); #endif - snprintf(filename, lengthof(filename), "%s%s", path, ent->d_name); + res = snprintf(filename, lengthof(filename), "%s%s", path, ent->d_name); + + /* Could we fully concatenate the path and filename? */ + if (res >= (int)lengthof(filename) || res < 0) return false; return stat(filename, sb) == 0; } |