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

Fix: Possible double path separator in FiosMakeFilename

pull/7802/head
Juriy Petrochenkov 2019-08-17 12:11:01 +03:00 committed by Charles Pigott
parent f13b184588
commit 8c6a16ba28
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/fios.cpp
View File

@ -205,12 +205,18 @@ const char *FiosBrowseTo(const FiosItem *item)
*/ */
static void FiosMakeFilename(char *buf, const char *path, const char *name, const char *ext, const char *last) static void FiosMakeFilename(char *buf, const char *path, const char *name, const char *ext, const char *last)
{ {
const char *period; if (path != nullptr) {
const char *buf_start = buf;
buf = strecpy(buf, path, last);
/* Remove trailing path separator, if present */
if (buf > buf_start && buf[-1] == PATHSEPCHAR) buf--;
}
/* Don't append the extension if it is already there */ /* Don't append the extension if it is already there */
period = strrchr(name, '.'); const char *period = strrchr(name, '.');
if (period != nullptr && strcasecmp(period, ext) == 0) ext = ""; if (period != nullptr && strcasecmp(period, ext) == 0) ext = "";
seprintf(buf, last, "%s" PATHSEP "%s%s", path, name, ext);
seprintf(buf, last, PATHSEP "%s%s", name, ext);
} }
/** /**