summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2017-01-12 11:21:12 -0800
committerCommit bot <commit-bot@chromium.org>2017-01-12 11:21:12 -0800
commit6cf5ecae75a5cd6fea9ae7f4e28cc28abb3e69c6 (patch)
tree07f913aa6847952a32ed787f2861a5099d81cf69 /fpdfsdk
parent192497124e7cde747ade7bf89028586eea293be5 (diff)
downloadpdfium-6cf5ecae75a5cd6fea9ae7f4e28cc28abb3e69c6.tar.xz
Don't put timers with ID == 0 into the global timer map.
A return of ID == 0 from the embedder means the timer was not created (see public/fpdf_formfill.h), although few embedders actually conform to this convention. Firing a timer with ID == 0 will thus do nothing since there can't be such a timer in the map. BUG=679649 Review-Url: https://codereview.chromium.org/2626863003
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/fpdfformfill_embeddertest.cpp17
-rw-r--r--fpdfsdk/javascript/app.cpp3
2 files changed, 19 insertions, 1 deletions
diff --git a/fpdfsdk/fpdfformfill_embeddertest.cpp b/fpdfsdk/fpdfformfill_embeddertest.cpp
index baf4853f17..47f1a75efb 100644
--- a/fpdfsdk/fpdfformfill_embeddertest.cpp
+++ b/fpdfsdk/fpdfformfill_embeddertest.cpp
@@ -179,4 +179,21 @@ TEST_F(FPDFFormFillEmbeddertest, BUG_634716) {
EXPECT_EQ(2U, alerts.size());
}
+TEST_F(FPDFFormFillEmbeddertest, BUG_679649) {
+ EmbedderTestTimerHandlingDelegate delegate;
+ SetDelegate(&delegate);
+
+ EXPECT_TRUE(OpenDocument("bug_679649.pdf"));
+ FPDF_PAGE page = LoadPage(0);
+ EXPECT_TRUE(page);
+
+ delegate.SetFailNextTimer();
+ DoOpenActions();
+ delegate.AdvanceTime(2000);
+ UnloadPage(page);
+
+ const auto& alerts = delegate.GetAlerts();
+ EXPECT_EQ(0u, alerts.size());
+}
+
#endif // PDF_ENABLE_V8
diff --git a/fpdfsdk/javascript/app.cpp b/fpdfsdk/javascript/app.cpp
index 80c952d6ca..6562d1b598 100644
--- a/fpdfsdk/javascript/app.cpp
+++ b/fpdfsdk/javascript/app.cpp
@@ -75,7 +75,8 @@ GlobalTimer::GlobalTimer(app* pObj,
m_pFormFillEnv(pFormFillEnv) {
CFX_SystemHandler* pHandler = m_pFormFillEnv->GetSysHandler();
m_nTimerID = pHandler->SetTimer(dwElapse, Trigger);
- (*GetGlobalTimerMap())[m_nTimerID] = this;
+ if (m_nTimerID)
+ (*GetGlobalTimerMap())[m_nTimerID] = this;
}
GlobalTimer::~GlobalTimer() {