Date: Sun, 10 May 2020 14:56:26 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r360875 - stable/12/contrib/llvm-project/llvm/lib/Support/Unix Message-ID: <202005101456.04AEuQYQ004546@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Sun May 10 14:56:25 2020 New Revision: 360875 URL: https://svnweb.freebsd.org/changeset/base/360875 Log: MFC r360801: 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 Modified: stable/12/contrib/llvm-project/llvm/lib/Support/Unix/Path.inc Directory Properties: stable/12/ (props changed) Modified: stable/12/contrib/llvm-project/llvm/lib/Support/Unix/Path.inc ============================================================================== --- stable/12/contrib/llvm-project/llvm/lib/Support/Unix/Path.inc Sun May 10 14:53:08 2020 (r360874) +++ stable/12/contrib/llvm-project/llvm/lib/Support/Unix/Path.inc Sun May 10 14:56:25 2020 (r360875) @@ -208,14 +208,9 @@ std::string getMainExecutable(const char *argv0, void while (*p++ != 0) ; // Iterate through auxiliary vectors for AT_EXECPATH. - for (;;) { - switch (*(uintptr_t *)p++) { - case AT_EXECPATH: + for (; *(uintptr_t *)p != AT_NULL; p++) { + if (*(uintptr_t *)p++ == AT_EXECPATH) return *p; - case AT_NULL: - break; - } - p++; } #endif // Fall back to argv[0] if auxiliary vectors are not available.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005101456.04AEuQYQ004546>