cpp/openttd-patchpack/source Changeset - r6763:51e34be35206

Changeset - r6763:51e34be35206

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 17 years ago 2007-05-31 14:29:19
rubidium@openttd.org

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

1 file changed with 4 insertions and 3 deletions:

src/fios.cpp

0 comments (0 inline, 0 general)

src/fios.cpp

➞

Show inline comments

@@ @@ -114,11 +114,12 @@ char *FiosBrowseTo(const FiosItem *item) @@
 	case FIOS_TYPE_PARENT:
 		/* 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 = 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__)
 		/* On MorphOS or AmigaOS paths look like: "Volume:directory/subdirectory" */
 		else if ((s = strrchr(path, ':')) != NULL) s[1] = '\0';

0 comments (0 inline, 0 general)