From bdda248194428ed9118f8afb3cb9df34d296c81a Mon Sep 17 00:00:00 2001 From: Heilig Benedek Date: Fri, 26 Oct 2018 16:57:03 +0200 Subject: [PATCH] fix: check for shared memory handle validity before closing, remove DebugDumpData call (#15402) --- .../chrome/browser/printing/print_view_manager_base.cc | 1 - .../chrome/renderer/printing/print_web_view_helper_pdf_win.cc | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/chromium_src/chrome/browser/printing/print_view_manager_base.cc b/chromium_src/chrome/browser/printing/print_view_manager_base.cc index 3c7055a6f4c0..a46335f6fd29 100644 --- a/chromium_src/chrome/browser/printing/print_view_manager_base.cc +++ b/chromium_src/chrome/browser/printing/print_view_manager_base.cc @@ -165,7 +165,6 @@ void PrintViewManagerBase::OnDidPrintPage( reinterpret_cast(shared_buf.memory()), params.data_size); - document->DebugDumpData(bytes.get(), FILE_PATH_LITERAL(".pdf")); print_job_->StartPdfToEmfConversion( bytes, params.page_size, params.content_area, print_text_with_gdi); } diff --git a/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc b/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc index bbd65ebb15b1..a555e6046c83 100644 --- a/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc +++ b/chromium_src/chrome/renderer/printing/print_web_view_helper_pdf_win.cc @@ -106,7 +106,9 @@ bool PrintWebViewHelper::PrintPagesNative(blink::WebLocalFrame* frame, printed_page_params.content_area = content_area_in_dpi[i]; Send(new PrintHostMsg_DidPrintPage(routing_id(), printed_page_params)); // Send the rest of the pages with an invalid metafile handle. - printed_page_params.metafile_data_handle.Close(); + if (printed_page_params.metafile_data_handle.IsValid()) { + printed_page_params.metafile_data_handle.Close(); + } printed_page_params.metafile_data_handle = base::SharedMemoryHandle(); } return true;