github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: cherry-pick 9591642a0896 from pdfium (#26213)

Browse Source 
* chore: cherry-pick 9591642a0896 from pdfium

* update patches

Co-authored-by: Electron Bot <anonymous@electronjs.org>
This commit is contained in:
Jeremy Rose
2020-10-28 12:21:42 -07:00
committed by GitHub
parent 8443cf143b
commit eca3138e10
2 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/pdfium/.patches
View File

@@ -1 +1,2 @@
backport_1091404.patch
cherry-pick-9591642a0896.patch

33
patches/pdfium/cherry-pick-9591642a0896.patch Normal file
View File

@@ -0,0 +1,33 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Mon, 19 Oct 2020 17:07:57 +0000
Subject: Reverse order of CPWL_ListCtrl and CPWL_List_Notify cleanup
(Speculative) fix for the crash in 1137630, since it only reproduces
sporadically on my system, but hasn't re-occured since applying the
patch.
TBR: thestig@chromium.org
Bug: chromium:1137630
Change-Id: I4f52c7109eca00dfa8faee9bc6341cd94c25b60c
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/75090
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
(cherry picked from commit 7dd9dbd6dd4959a568e7701da19871f859f8dce2)
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/75350
Reviewed-by: Tom Sepez <tsepez@chromium.org>
diff --git a/fpdfsdk/pwl/cpwl_list_box.h b/fpdfsdk/pwl/cpwl_list_box.h
index ba3a653bd9ca17bf5d916fcba1509f072eefd837..3104acb9ae0b74b1c49beee95b31451ebfc5f981 100644
--- a/fpdfsdk/pwl/cpwl_list_box.h
+++ b/fpdfsdk/pwl/cpwl_list_box.h
@@ -97,8 +97,8 @@ class CPWL_ListBox : public CPWL_Wnd {
protected:
bool m_bMouseDown = false;
bool m_bHoverSel = false;
+ std::unique_ptr<CPWL_List_Notify> m_pListNotify; // Must outlive |m_pList|.
std::unique_ptr<CPWL_ListCtrl> m_pList;
- std::unique_ptr<CPWL_List_Notify> m_pListNotify;
UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify;
private: