commit 5a7e330ef5e013e5df5fe771d3901ff890aa9731
author Henrique Nakashima <hnakashima@chromium.org> Thu Mar 08 20:41:59 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Thu Mar 08 20:41:59 2018 +0000
tree 6bbb05b2e00b30408a38a484ce87c3598fc3c865
parent a724cb2df9f7b766174ac578cd4d435596898cc1

Unset timer in XFA scrollbar after stopping it.

This fixes a crash that happens after interacting with the scrollbar
a few times.

Bug: chromium:820210
Change-Id: I458337f21c9322351474a1574ab596c600dcbbbf
Reviewed-on: https://pdfium-review.googlesource.com/28290
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>

xfa/fwl/cfwl_scrollbar.cpp

diff --git a/xfa/fwl/cfwl_scrollbar.cpp b/xfa/fwl/cfwl_scrollbar.cpp
index 26c367a..1d22386 100644
--- a/xfa/fwl/cfwl_scrollbar.cpp
+++ b/xfa/fwl/cfwl_scrollbar.cpp
@@ -385,8 +385,11 @@
 }
 
 void CFWL_ScrollBar::OnLButtonUp(const CFX_PointF& point) {
-  if (m_pTimerInfo)
+  if (m_pTimerInfo) {
     m_pTimerInfo->StopTimer();
+    m_pTimerInfo = nullptr;
+  }
+
   m_bMouseDown = false;
   DoMouseUp(0, m_rtMinBtn, m_iMinButtonState, point);
   DoMouseUp(1, m_rtThumb, m_iThumbButtonState, point);
@@ -487,8 +490,10 @@
 
 void CFWL_ScrollBar::Timer::Run(CFWL_TimerInfo* pTimerInfo) {
   CFWL_ScrollBar* pScrollBar = static_cast<CFWL_ScrollBar*>(m_pWidget.Get());
-  if (pScrollBar->m_pTimerInfo)
+  if (pScrollBar->m_pTimerInfo) {
     pScrollBar->m_pTimerInfo->StopTimer();
+    pScrollBar->m_pTimerInfo = nullptr;
+  }
 
   if (!pScrollBar->SendEvent())
     pScrollBar->m_pTimerInfo = StartTimer(0, true);