mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix #8230: Resolve ".." when opening files in .tar (#8231)

pull/8235/head
glx22 2020-06-22 14:21:11 +02:00 committed by GitHub
parent e6f3e15c32
commit 87a069c887
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/fileio.cpp
View File

@ -25,6 +25,7 @@
#endif
#include <sys/stat.h>
#include <algorithm>
#include <sstream>
#ifdef WITH_XDG_BASEDIR
#include <basedir.h>
@ -481,6 +482,28 @@ FILE *FioFOpenFile(const char *filename, const char *mode, Subdirectory subdir,
strecpy(resolved_name, filename, lastof(resolved_name));
strtolower(resolved_name);
/* Resolve ".." */
std::istringstream ss(resolved_name);
std::vector<std::string> tokens;
std::string token;
while (std::getline(ss, token, PATHSEPCHAR)) {
if (token == "..") {
if (tokens.size() < 2) return nullptr;
tokens.pop_back();
} else {
tokens.push_back(token);
}
}
resolved_name[0] = '\0';
bool first = true;
for (const std::string &token : tokens) {
if (!first) {
strecat(resolved_name, PATHSEP, lastof(resolved_name));
}
strecat(resolved_name, token.c_str(), lastof(resolved_name));
first = false;
}
size_t resolved_len = strlen(resolved_name);
/* Resolve ONE directory link */