diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/sandbox/linux/seccomp-bpf/trap.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/sandbox/linux/seccomp-bpf/trap.cc')
| -rw-r--r-- | chromium/sandbox/linux/seccomp-bpf/trap.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/sandbox/linux/seccomp-bpf/trap.cc b/chromium/sandbox/linux/seccomp-bpf/trap.cc index 9884be8bb2c..f5b86a73ac7 100644 --- a/chromium/sandbox/linux/seccomp-bpf/trap.cc +++ b/chromium/sandbox/linux/seccomp-bpf/trap.cc @@ -60,7 +60,7 @@ bool GetIsInSigHandler(const ucontext_t* ctx) { void SetIsInSigHandler() { sigset_t mask; if (sigemptyset(&mask) || sigaddset(&mask, LINUX_SIGBUS) || - sandbox::sys_sigprocmask(LINUX_SIG_BLOCK, &mask, NULL)) { + sandbox::sys_sigprocmask(LINUX_SIG_BLOCK, &mask, nullptr)) { SANDBOX_DIE("Failed to block SIGBUS"); } } @@ -77,7 +77,7 @@ bool IsDefaultSignalAction(const struct sigaction& sa) { namespace sandbox { Trap::Trap() - : trap_array_(NULL), + : trap_array_(nullptr), trap_array_size_(0), trap_array_capacity_(0), has_unsafe_traps_(false) { @@ -104,7 +104,7 @@ Trap::Trap() // Unmask SIGSYS sigset_t mask; if (sigemptyset(&mask) || sigaddset(&mask, LINUX_SIGSYS) || - sys_sigprocmask(LINUX_SIG_UNBLOCK, &mask, NULL)) { + sys_sigprocmask(LINUX_SIG_UNBLOCK, &mask, nullptr)) { SANDBOX_DIE("Failed to configure SIGSYS handler"); } } |