[MediaWiki-commits] [Gerrit] Zero timeout flag on unpause - change (mediawiki...luasandbox)

[Tim Starling (Code Review)]

Tim Starling has submitted this change and it was merged.

Change subject: Zero timeout flag on unpause
......................................................................


Zero timeout flag on unpause

When the normal limit timer fires while timers are paused, the timestamp
is recorded and the timer is recheduled on unpause. But we forgot to
zero out that timestamp, so the next time it is paused and unpaused it
would reschedule the timer again. This may lead to incorrect behavior.

Change-Id: Ib4118f7d1aed218ceb2fb567a65bb60a92ad21db
---
M timer.c
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Tim Starling: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/timer.c b/timer.c
index 8cb3738..61bf4d0 100644
--- a/timer.c
+++ b/timer.c
@@ -614,9 +614,10 @@
                        luasandbox_timer_subtract(&delta, &lts->pause_start);
                        luasandbox_timer_add(&delta, &lts->pause_delta);
 
-                       // Zero out pause vars
+                       // Zero out pause vars and expired timestamp (since we 
handled it)
                        luasandbox_timer_zero(&lts->pause_start);
                        luasandbox_timer_zero(&lts->pause_delta);
+                       luasandbox_timer_zero(&lts->normal_expired_at);
 
                        // Restart timer
                        lts->normal_remaining = delta;

-- 
To view, visit https://gerrit.wikimedia.org/r/53472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4118f7d1aed218ceb2fb567a65bb60a92ad21db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: master
Gerrit-Owner: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits