summaryrefslogtreecommitdiffstats
path: root/printing/printing_context_system_dialog_win.cc
diff options
context:
space:
mode:
authorvitalybuka <vitalybuka@chromium.org>2015-04-10 18:46:42 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-11 01:47:59 +0000
commit442258da866dda0b7ddcb35c51b9591e17c0de8c (patch)
treec6c1b0d7da91a3489ff7470d0e4f21033a8afc00 /printing/printing_context_system_dialog_win.cc
parent7d62e83efbfa90f457ffc8b9b996b4b0ffbeee6f (diff)
downloadchromium_src-442258da866dda0b7ddcb35c51b9591e17c0de8c.zip
chromium_src-442258da866dda0b7ddcb35c51b9591e17c0de8c.tar.gz
chromium_src-442258da866dda0b7ddcb35c51b9591e17c0de8c.tar.bz2
Fix crash from ipc_fuzzer
Can't reproduce original crash so I just fix all crashes I see. Use WeakPtr in AskUserForSettings callback. Move chrome::ShowMessageBox in separate task and protection against nested message boxes. Add missing return into AskUserForSettings. BUG=472146 Review URL: https://codereview.chromium.org/1083433003 Cr-Commit-Position: refs/heads/master@{#324746}
Diffstat (limited to 'printing/printing_context_system_dialog_win.cc')
-rw-r--r--printing/printing_context_system_dialog_win.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/printing/printing_context_system_dialog_win.cc b/printing/printing_context_system_dialog_win.cc
index e67ae3b..dd5e290 100644
--- a/printing/printing_context_system_dialog_win.cc
+++ b/printing/printing_context_system_dialog_win.cc
@@ -69,6 +69,7 @@ void PrintingContextSytemDialogWin::AskUserForSettings(
if (ShowPrintDialog(&dialog_options) != S_OK) {
ResetSettings();
callback.Run(FAILED);
+ return;
}
// TODO(maruel): Support PD_PRINTTOFILE.