Changeset 33936

Timestamp:

09/07/2015 02:38:12 AM (9 years ago)

Author:

dd32

Message:

Cron: Reject events when the provided $timestamp is not a valid timestamp.

Invalid timestamps were previously accepted by the scheduling functions but would never be run due to our implementation which caused the cron option to forever contain the events.
This rejects such events which most likely only occur due to developer error.

Props utkarshpatel, wonderboymusic, SergeyBiryukov.
See #33423, Fixes #33475

File:

• trunk/src/wp-includes/cron.php (modified) (4 diffs)

trunk/src/wp-includes/cron.php

@@ -19 +19 @@
  * @param string $hook Action hook to execute when cron is run.
  * @param array $args Optional. Arguments to pass to the hook's callback function.
- * @return void|false
+ * @return false|void False when an event is not scheduled.
  */
 function wp_schedule_single_event( $timestamp, $hook, $args = array()) {
-    // don't schedule a duplicate if there's already an identical event due within 10 minutes of it
+    // Make sure timestamp is a positive integer
+    if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
+        return false;
+    }
+
+    // Don't schedule a duplicate if there's already an identical event due within 10 minutes of it
     $next = wp_next_scheduled($hook, $args);
     if ( $next && abs( $next - $timestamp ) <= 10 * MINUTE_IN_SECONDS ) {
-        return;
+        return false;
     }
 
@@ -68 +73 @@
  * @param string $hook Action hook to execute when cron is run.
  * @param array $args Optional. Arguments to pass to the hook's callback function.
- * @return false|void False when does not schedule event.
+ * @return false|void False when an event is not scheduled.
  */
 function wp_schedule_event( $timestamp, $recurrence, $hook, $args = array()) {
+    // Make sure timestamp is a positive integer
+    if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
+        return false;
+    }
+
     $crons = _get_cron_array();
     $schedules = wp_get_schedules();
@@ -101 +111 @@
  * @param string $hook Action hook to execute when cron is run.
  * @param array $args Optional. Arguments to pass to the hook's callback function.
- * @return false|void False when does not schedule event.
+ * @return false|void False when an event is not scheduled.
  */
 function wp_reschedule_event( $timestamp, $recurrence, $hook, $args = array() ) {
+    // Make sure timestamp is a positive integer
+    if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
+        return false;
+    }
+
     $crons = _get_cron_array();
     $schedules = wp_get_schedules();
@@ -149 +164 @@
  */
 function wp_unschedule_event( $timestamp, $hook, $args = array() ) {
+    // Make sure timestamp is a positive integer
+    if ( ! is_numeric( $timestamp ) || $timestamp <= 0 ) {
+        return false;
+    }
+
     $crons = _get_cron_array();
     $key = md5(serialize($args));