Merge remote-tracking branch 'upstream/master'

This commit is contained in:
ChrisDill
2018-09-27 15:54:02 +01:00
88 changed files with 87 additions and 8 deletions

View File

@@ -1424,8 +1424,7 @@ const char *GetDirectoryPath(const char *fileName)
memset(filePath, 0, 256);
lastSlash = strprbrk(fileName, "\\/");
if (!lastSlash)
return NULL;
if (!lastSlash) return NULL;
strncpy(filePath, fileName, strlen(fileName) - (strlen(lastSlash) - 1));
filePath[strlen(fileName) - strlen(lastSlash)] = '\0';