toolkit/crashreporter/breakpad-patches/17-bug942407-usersig.patch@129ffea94266 (annotated)
toolkit/crashreporter/breakpad-patches/17-bug942407-usersig.patch
Sat, 03 Jan 2015 20:18:00 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 03 Jan 2015 20:18:00 +0100
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
- permissions
- -rw-r--r--
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
| michael@0 | 1 | # HG changeset patch |
| michael@0 | 2 | # User Jed Davis <jld@mozilla.com> |
| michael@0 | 3 | |
| michael@0 | 4 | Bug 942407: Fix breakpad signal handler's test for signal origin. r=ted |
| michael@0 | 5 | |
| michael@0 | 6 | |
| michael@0 | 7 | diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc |
| michael@0 | 8 | index 55834e0..df958fb 100644 |
| michael@0 | 9 | --- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc |
| michael@0 | 10 | +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc |
| michael@0 | 11 | @@ -334,20 +334,20 @@ void ExceptionHandler::SignalHandler(int sig, siginfo_t* info, void* uc) { |
| michael@0 | 12 | if (handled) { |
| michael@0 | 13 | signal(sig, SIG_DFL); |
| michael@0 | 14 | } else { |
| michael@0 | 15 | RestoreHandlersLocked(); |
| michael@0 | 16 | } |
| michael@0 | 17 | |
| michael@0 | 18 | pthread_mutex_unlock(&handler_stack_mutex_); |
| michael@0 | 19 | |
| michael@0 | 20 | - if (info->si_pid) { |
| michael@0 | 21 | - // This signal was triggered by somebody sending us the signal with kill(). |
| michael@0 | 22 | - // In order to retrigger it, we have to queue a new signal by calling |
| michael@0 | 23 | - // kill() ourselves. |
| michael@0 | 24 | + if (info->si_code <= 0) { |
| michael@0 | 25 | + // This signal was sent by another process. (Positive values of |
| michael@0 | 26 | + // si_code are reserved for kernel-originated signals.) In order |
| michael@0 | 27 | + // to retrigger it, we have to queue a new signal. |
| michael@0 | 28 | if (tgkill(getpid(), syscall(__NR_gettid), sig) < 0) { |
| michael@0 | 29 | // If we failed to kill ourselves (e.g. because a sandbox disallows us |
| michael@0 | 30 | // to do so), we instead resort to terminating our process. This will |
| michael@0 | 31 | // result in an incorrect exit code. |
| michael@0 | 32 | _exit(1); |
| michael@0 | 33 | } |
| michael@0 | 34 | } else { |
| michael@0 | 35 | // This was a synchronous signal triggered by a hard fault (e.g. SIGSEGV). |
| michael@0 | 36 | -- |
| michael@0 | 37 | 1.8.4.rc3 |
| michael@0 | 38 |
