Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid concatenating empty paths #950

Open
wants to merge 1 commit into
base: vanilla
Choose a base branch
from
Open

Avoid concatenating empty paths #950

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion common/paths_posix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ const char* PathsClass::Program_Path()
path = (char*)malloc(size);
if (!_NSGetExecutablePath(path, &size)) {
free(path);
ProgramPath = ".";
return ProgramPath.c_str();
}
}
Expand All @@ -160,12 +161,14 @@ const char* PathsClass::Program_Path()
size_t size = sizeof(buffer1);

if (sysctl(mib, (u_int)(sizeof(mib) / sizeof(mib[0])), path, &size, NULL, 0) != 0) {
ProgramPath = ".";
return ProgramPath.c_str();
}

resolved = realpath(path, buffer);
#endif
if (!resolved) {
ProgramPath = ".";
return ProgramPath.c_str();
}

Expand Down Expand Up @@ -243,7 +246,9 @@ bool PathsClass::Is_Absolute(const char* path)

std::string PathsClass::Concatenate_Paths(const char* path1, const char* path2)
{
return std::string(path1) + SEP + path2;
if (path1 != NULL && *path1 != '\0')
return std::string(path1) + SEP + path2;
return std::string(path2);
}

std::string PathsClass::Argv_Path(const char* cmd_arg)
Expand Down
Loading