dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r17689) -Fix (r16307): depend could segfault in some case (TrueBrain)

Browse Source
This commit is contained in:
glx
2009-10-04 12:17:10 +00:00
parent c344ae2e1d
commit 1e665c7639
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/depend/depend.cpp
View File

@@ -426,7 +426,8 @@ const char *GeneratePath(const char *dirname, const char *filename, bool local)
/* Remove '..' from the begin of the filename. */ /* Remove '..' from the begin of the filename. */
while (*p == '.') { while (*p == '.') {
if (*(++p) == '.') { if (*(++p) == '.') {
*(strrchr(path, '/')) = '\0'; char *s = strrchr(path, '/');
if (s != NULL) *s = '\0';
p += 2; p += 2;
} }
} }
@@ -443,7 +444,8 @@ const char *GeneratePath(const char *dirname, const char *filename, bool local)
/* Remove '..' from the begin of the filename. */ /* Remove '..' from the begin of the filename. */
while (*p == '.') { while (*p == '.') {
if (*(++p) == '.') { if (*(++p) == '.') {
*(strrchr(path, '/')) = '\0'; char *s = strrchr(path, '/');
if (s != NULL) *s = '\0';
p += 2; p += 2;
} }
} }