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

(svn r9998) -Fix (r9990): possible null pointer dereferences on MorphOS.

release/0.6
rubidium 2007-05-31 14:29:19 +00:00
parent efd2fce9a4
commit a02417645e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/fios.cpp
View File

@ -114,11 +114,12 @@ char *FiosBrowseTo(const FiosItem *item)
case FIOS_TYPE_PARENT: case FIOS_TYPE_PARENT:
/* Check for possible NULL ptr (not required for UNIXes, but AmigaOS-alikes) */ /* Check for possible NULL ptr (not required for UNIXes, but AmigaOS-alikes) */
if ((s = strrchr(path, PATHSEPCHAR)) != path) { s = strrchr(path, PATHSEPCHAR);
if (s != NULL && s != path) {
s[0] = '\0'; // Remove last path separator character, so we can go up one level. s[0] = '\0'; // Remove last path separator character, so we can go up one level.
s = strrchr(path, PATHSEPCHAR);
if (s != NULL) s[1] = '\0'; // go up a directory
} }
s = strrchr(path, PATHSEPCHAR);
if (s != NULL) s[1] = '\0'; // go up a directory
#if defined(__MORPHOS__) || defined(__AMIGAOS__) #if defined(__MORPHOS__) || defined(__AMIGAOS__)
/* On MorphOS or AmigaOS paths look like: "Volume:directory/subdirectory" */ /* On MorphOS or AmigaOS paths look like: "Volume:directory/subdirectory" */
else if ((s = strrchr(path, ':')) != NULL) s[1] = '\0'; else if ((s = strrchr(path, ':')) != NULL) s[1] = '\0';