diff options
author | primiano <primiano@chromium.org> | 2015-05-01 09:39:29 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-01 16:40:03 +0000 |
commit | e5e3d99fedbb267b55b33376ff82eb244291579d (patch) | |
tree | 117c60959e530df419c224972f48cbec3c8b1b43 /android_webview/common | |
parent | 917f109c4fe70284ed4245230e40578cf53971e6 (diff) | |
download | chromium_src-e5e3d99fedbb267b55b33376ff82eb244291579d.zip chromium_src-e5e3d99fedbb267b55b33376ff82eb244291579d.tar.gz chromium_src-e5e3d99fedbb267b55b33376ff82eb244291579d.tar.bz2 |
Roll breakpad and fix signal propagation for WebView crash handler
This applies the fix described in https://breakpad.appspot.com/6844002
to both Breakpad and the 2nd Android WebView crash handler (aw_crash_handler)
aw_crash_handler, which is soon to be deprecated and incorporated in
the breakpad microdump one, prints the version code upon a crash,
reuses the same breakpad signal handling logic and, threrefore,
requires the same fix.
The following revision is pulled in by the breakpad roll:
https://chromium.googlesource.com/external/google-breakpad/src/+/9fcbe255a64d39295ad5f1f15c0b92db3da83c0f
BUG=483399
Review URL: https://codereview.chromium.org/1113353002
Cr-Commit-Position: refs/heads/master@{#327921}
Diffstat (limited to 'android_webview/common')
-rw-r--r-- | android_webview/common/aw_crash_handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android_webview/common/aw_crash_handler.cc b/android_webview/common/aw_crash_handler.cc index bbdc61b..ae0f045 100644 --- a/android_webview/common/aw_crash_handler.cc +++ b/android_webview/common/aw_crash_handler.cc @@ -49,7 +49,7 @@ void AwExceptionHandler(int sig, siginfo_t* info, void* uc) { } } - if ((info != NULL && info->si_pid) || sig == SIGABRT) { + if ((info != NULL && SI_FROMUSER(info)) || sig == SIGABRT) { // This signal was triggered by somebody sending us the signal with kill(). // In order to retrigger it, we have to queue a new signal by calling // kill() ourselves. The special case (si_pid == 0 && sig == SIGABRT) is |