Merge commit 21e5e1724b75 from llvm git:
getMainExecutable: Fix hand-rolled AT_EXECPATH for older FreeBSD Once we hit AT_NULL, we need to bail out of the loop; not just the enclosing switch. This fixes basic usage (e.g. `cc --version`) when AT_EXECPATH isn't present on older branches (e.g. under emu-user-static, at the moment), where we would previously run off the end of ::environ. Patch By: kevans Reviewed By: arichardson Differential Revision: https://reviews.llvm.org/D79239 MFC after: 3 days
This commit is contained in:
parent
b1ddcbc62c
commit
c7d9dfe810
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=360801
@ -208,14 +208,9 @@ std::string getMainExecutable(const char *argv0, void *MainAddr) {
|
|||||||
while (*p++ != 0)
|
while (*p++ != 0)
|
||||||
;
|
;
|
||||||
// Iterate through auxiliary vectors for AT_EXECPATH.
|
// Iterate through auxiliary vectors for AT_EXECPATH.
|
||||||
for (;;) {
|
for (; *(uintptr_t *)p != AT_NULL; p++) {
|
||||||
switch (*(uintptr_t *)p++) {
|
if (*(uintptr_t *)p++ == AT_EXECPATH)
|
||||||
case AT_EXECPATH:
|
|
||||||
return *p;
|
return *p;
|
||||||
case AT_NULL:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
p++;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
// Fall back to argv[0] if auxiliary vectors are not available.
|
// Fall back to argv[0] if auxiliary vectors are not available.
|
||||||
|
Loading…
Reference in New Issue
Block a user