Changeset 51916

Timestamp:

10/18/2021 12:51:00 PM (3 years ago)

Author:

hellofromTonya

Message:

Cron: Fix malformed cron array in wp_schedule_single_event() when _get_cron_array() returns false.

In wp_schedule_single_event(), the cron info array is retrieved via a call to _get_cron_array() and straight away cast to an array. But as the documentation for that function (correctly) states, the return type of that function is array|false, where false is returned for a site where no cron jobs have been scheduled (yet).

In the case that _get_cron_array() would return false, this would now unintentionally create an array with a single entry with key 0 and as the value false.

This is a bug. Fixed now by adding validation to the output of _get_cron_array() and initializing $crons to an empty array if false was returned.

Tests added first to prove the bug (a) was introduced in #44818 [44917] and (b) is now fixed.

Follow-up to [44917].

Props jrf, peterwilsoncc.
Fixes #53950.

Location:

trunk

Files:

• src/wp-includes/cron.php (modified) (1 diff)
• tests/phpunit/tests/cron.php (modified) (2 diffs)

trunk/src/wp-includes/cron.php

@@ -119 +119 @@
      * are considered duplicates.
      */
-    $crons     = (array) _get_cron_array();
+    $crons = _get_cron_array();
+    if ( ! is_array( $crons ) ) {
+        $crons = array();
+    }
+
     $key       = md5( serialize( $event->args ) );
     $duplicate = false;

trunk/tests/phpunit/tests/cron.php

@@ -101 +101 @@
     }
 
-
     /**
      * Tests that a call to wp_schedule_event() on a site without any scheduled events
@@ -124 +123 @@
         // Add an event.
         $this->assertTrue( wp_schedule_event( $timestamp, 'daily', $hook ) );
+    }
+
+    /**
+     * Tests that a call to wp_schedule_single_event() on a site without any scheduled events
+     * does not result in the value "false" being added into the cron array.
+     *
+     * @ticket 53950
+     *
+     * @covers ::wp_schedule_single_event
+     */
+    function test_wp_schedule_single_event_without_cron_option() {
+        delete_option( 'cron' );
+
+        // Verify that the cause of the error is in place.
+        $this->assertFalse( _get_cron_array(), '_get_cron_array() does not return false' );
+
+        $hook      = __FUNCTION__;
+        $timestamp = strtotime( '+10 minutes' );
+
+        // Add an event.
+        $this->assertTrue( wp_schedule_single_event( $timestamp, $hook ), 'Scheduling single event failed' );
+
+        // Verify that "false" is not a value in the final cron array.
+        $this->assertNotContains( false, get_option( 'cron' ), 'Resulting cron array contains the value "false"' );
     }