Changeset 56851 for branches/4.2/src/wp-includes/class-wp-theme.php

Timestamp:

10/12/2023 02:25:18 PM (2 years ago)

Author:

davidbaumwald

Message:

Grouped backports to the 4.2 branch.

• Comments: Prevent users who can not see a post from seeing comments on it.
• Shortcodes: Restrict ajax handler for media shortcode.
• Prevent unintended behavior when certain objects are unserialized.

Merges [56835], [56836], and [56838] to the 4.1 branch.
Props xknown, jorbin, joehoyle, peterwilsoncc, ehtis, tykoted, antpb.

File:

• branches/4.2/src/wp-includes/class-wp-theme.php (modified) (2 diffs)

branches/4.2/src/wp-includes/class-wp-theme.php

@@ -478 +478 @@
 
     /**
+     * Perform reinitialization tasks.
+     *
+     * Prevents a callback from being injected during unserialization of an object.
+     *
+     * @return void
+     */
+    public function __wakeup() {
+        if ( $this->parent && ! $this->parent instanceof self ) {
+            throw new UnexpectedValueException();
+        }
+        if ( $this->headers && ! is_array( $this->headers ) ) {
+            throw new UnexpectedValueException();
+        }
+        foreach ( $this->headers as $value ) {
+            if ( ! is_string( $value ) ) {
+                throw new UnexpectedValueException();
+            }
+        }
+        $this->headers_sanitized = array();
+    }
+
+    /**
      * Adds theme data to cache.
      *
@@ -1236 +1258 @@
         return strnatcasecmp( $a->display( 'Name', false, true ), $b->display( 'Name', false, true ) );
     }
+
+    private static function _check_headers_property_has_correct_type( $headers ) {
+        if ( ! is_array( $headers ) ) {
+            return false;
+        }
+        foreach ( $headers as $key => $value ) {
+            if ( ! is_string( $key ) || ! is_string( $value ) ) {
+                return false;
+            }
+        }
+        return true;
+    }
 }