Reset notify parameter in CPWL_ListBox OnDestroy().

fpdfsdk/pdfwindow/PWL_ListBox.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/pdfwindow/PWL_ListBox.h"
 
 #include "fpdfsdk/fxedit/include/fxet_edit.h"
 #include "fpdfsdk/fxedit/include/fxet_list.h"
@@ skipping 55 matching lines @@
   m_pList->InvalidateRect(pRect);
 }
 
 CPWL_ListBox::CPWL_ListBox()
     : m_pList(new CFX_ListCtrl),
       m_bMouseDown(FALSE),
       m_bHoverSel(FALSE),
       m_pFillerNotify(nullptr) {}
 
 CPWL_ListBox::~CPWL_ListBox() {
+  // Remove the notifier from the list before we start destruction because
+  // CFX_ListCtrl will cause an invalidation on destruction. That invalidation
+  // will call into the m_pListNotify object, but, m_pListNotify may have

[Lei Zhang, 2016/07/18 22:22:07]

|m_pListNotify|, no comma after "but"

[dsinclair, 2016/07/19 13:13:45]

Done.

+  // already been destroyed.
+  if (m_pList)

[Lei Zhang, 2016/07/18 22:22:07]

BTW, I think this always evals to true? Maybe for another CL.

[dsinclair, 2016/07/19 13:13:45]

Possibly, have to check the child classes to see if they set it to nullptr or
not.

+    m_pList->SetNotify(nullptr);

[Lei Zhang, 2016/07/18 22:22:07]

Should this be in OnDestroy() below to mirror the SetNotify(ptr) call in
OnCreated() ?

[dsinclair, 2016/07/19 13:13:45]

Done.

 }
 
 CFX_ByteString CPWL_ListBox::GetClassName() const {
   return "CPWL_ListBox";
 }
 
 void CPWL_ListBox::OnCreated() {
   if (m_pList) {
     m_pList->SetFontMap(GetFontMap());
     m_pListNotify.reset(new CPWL_List_Notify(this));
@@ skipping 436 matching lines @@
   if (zDelta < 0) {
     m_pList->OnVK_DOWN(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
   } else {
     m_pList->OnVK_UP(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
   }
 
   FX_BOOL bExit = FALSE;
   OnNotifySelChanged(FALSE, bExit, nFlag);
   return TRUE;
 }