6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 04:30:23 +00:00
Code Issues Projects Releases Wiki Activity

This patch ensures that Path::GetMainExecutable is able to handle the

Browse Source 
case where realpath() fails. When this occurs we segfault trying to
create a std::string from a NULL pointer.

Fixes PR5635.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@90082 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Kovarththanan Rajaratnam 2009-11-29 17:19:48 +00:00
parent a76a7883b5
commit d614673bb8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/System/Unix/Path.inc
View File

@ -348,7 +348,9 @@ Path Path::GetMainExecutable(const char *argv0, void *MainAddr) {
uint32_t size = sizeof(exe_path);
if (_NSGetExecutablePath(exe_path, &size) == 0) {
char link_path[MAXPATHLEN];
return Path(std::string(realpath(exe_path, link_path)));
if (realpath(exe_path, link_path))
return Path(std::string(link_path));
return Path();
}
#elif defined(__FreeBSD__)
char exe_path[PATH_MAX];
@ -370,7 +372,9 @@ Path Path::GetMainExecutable(const char *argv0, void *MainAddr) {
// If the filename is a symlink, we need to resolve and return the location of
// the actual executable.
char link_path[MAXPATHLEN];
return Path(std::string(realpath(DLInfo.dli_fname, link_path)));
if (realpath(DLInfo.dli_fname, link_path))
return Path(std::string(link_path));
return Path();
#endif
return Path();
}