maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(3p/nix): apply all clang-tidy fixes

Browse source 
Change-Id: I265e763393422ee1881653527c91024458060825
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1432
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Kane York 2020-07-24 21:09:44 -07:00 • committed by kanepyork
parent 69f402563a
commit ef54f5da9f
65 changed files with 580 additions and 497 deletions
Download patch file Download diff file Expand all files Collapse all files

10
third_party/nix/src/libmain/stack.cc vendored
View file

@ -9,14 +9,14 @@
namespace nix {
static void sigsegvHandler(int signo, siginfo_t* info, void* ctx) {
static void sigsegvHandler(int _signo, siginfo_t* info, void* ctx) {
/* Detect stack overflows by comparing the faulting address with
the stack pointer. Unfortunately, getting the stack pointer is
not portable. */
bool haveSP = true;
char* sp = nullptr;
#if defined(__x86_64__) && defined(REG_RSP)
sp = (char*)((ucontext_t*)ctx)->uc_mcontext.gregs[REG_RSP];
sp = (char*)(static_cast<ucontext_t*>(ctx))->uc_mcontext.gregs[REG_RSP];
#elif defined(REG_ESP)
sp = (char*)((ucontext_t*)ctx)->uc_mcontext.gregs[REG_ESP];
#else
@ -24,7 +24,7 @@ static void sigsegvHandler(int signo, siginfo_t* info, void* ctx) {
#endif
if (haveSP) {
ptrdiff_t diff = (char*)info->si_addr - sp;
ptrdiff_t diff = static_cast<char*>(info->si_addr) - sp;
if (diff < 0) {
diff = -diff;
}
@ -36,7 +36,7 @@ static void sigsegvHandler(int signo, siginfo_t* info, void* ctx) {
}
/* Restore default behaviour (i.e. segfault and dump core). */
struct sigaction act;
struct sigaction act {};
sigfillset(&act.sa_mask);
act.sa_handler = SIG_DFL;
act.sa_flags = 0;
@ -62,7 +62,7 @@ void detectStackOverflow() {
throw SysError("cannot set alternative stack");
}
struct sigaction act;
struct sigaction act {};
sigfillset(&act.sa_mask);
act.sa_sigaction = sigsegvHandler;
act.sa_flags = SA_SIGINFO | SA_ONSTACK;