diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2020-10-28 23:58:56 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2020-10-28 23:58:56 +0000 |
| commit | 671af6de511fe92f394fa15e6566d0c921334e70 (patch) | |
| tree | 6633f4e56d467a016f5f7f06191d54f608dee625 | |
| parent | net/unison232: isolate self-test from pre-existing $HOME (diff) | |
devel/llvm10: really fix the AT_EXECPATH fallback =(
It turns out that I made not one but *two* mistakes in applying this patch
from the version that I had sent upstream. This one is not an extra
semicolon, but rather not dereferencing p... p may never hit AT_NULL, but *p
certainly will.
The problem was isolated and the fix identified + tested by Andrew Gierth.
Reported by: Andrew Gierth <andrew_tao173 riddles org uk>
MFH: 2020Q4 (blanket: build fix)
| -rw-r--r-- | devel/llvm10/files/patch-lib_Support_Unix_Path.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/devel/llvm10/files/patch-lib_Support_Unix_Path.inc b/devel/llvm10/files/patch-lib_Support_Unix_Path.inc index 56cd0dc9e876..24a6e058ce1b 100644 --- a/devel/llvm10/files/patch-lib_Support_Unix_Path.inc +++ b/devel/llvm10/files/patch-lib_Support_Unix_Path.inc @@ -7,7 +7,7 @@ - for (;;) { - switch (*(uintptr_t *)p++) { - case AT_EXECPATH: -+ for (; (uintptr_t *)p != AT_NULL; p++) { ++ for (; *(uintptr_t *)p != AT_NULL; p++) { + if (*(uintptr_t *)p++ == AT_EXECPATH) return *p; - case AT_NULL: |