<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[56835] trunk/src/wp-includes: Prevent unintended behavior when certain objects are unserialized.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/56835">56835</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/56835","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jorbin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-10-12 12:32:43 +0000 (Thu, 12 Oct 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Prevent unintended behavior when certain objects are unserialized.
Props ehtis, xknown.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesRequestssrcHooksphp">trunk/src/wp-includes/Requests/src/Hooks.php</a></li>
<li><a href="#trunksrcwpincludesRequestssrcIriphp">trunk/src/wp-includes/Requests/src/Iri.php</a></li>
<li><a href="#trunksrcwpincludesRequestssrcSessionphp">trunk/src/wp-includes/Requests/src/Session.php</a></li>
<li><a href="#trunksrcwpincludesclasswpblockpatternsregistryphp">trunk/src/wp-includes/class-wp-block-patterns-registry.php</a></li>
<li><a href="#trunksrcwpincludesclasswpblocktyperegistryphp">trunk/src/wp-includes/class-wp-block-type-registry.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemephp">trunk/src/wp-includes/class-wp-theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesRequestssrcHooksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/Requests/src/Hooks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/Requests/src/Hooks.php 2023-10-12 12:29:18 UTC (rev 56834)
+++ trunk/src/wp-includes/Requests/src/Hooks.php 2023-10-12 12:32:43 UTC (rev 56835)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,4 +96,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ public function __wakeup() {
+ throw new \LogicException( __CLASS__ . ' should never be unserialized' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesRequestssrcIriphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/Requests/src/Iri.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/Requests/src/Iri.php 2023-10-12 12:29:18 UTC (rev 56834)
+++ trunk/src/wp-includes/Requests/src/Iri.php 2023-10-12 12:32:43 UTC (rev 56835)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -717,6 +717,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __wakeup() {
+ $class_props = get_class_vars( __CLASS__ );
+ $string_props = array( 'scheme', 'iuserinfo', 'ihost', 'port', 'ipath', 'iquery', 'ifragment' );
+ $array_props = array( 'normalization' );
+ foreach ( $class_props as $prop => $default_value ) {
+ if ( in_array( $prop, $string_props, true ) && ! is_string( $this->$prop ) ) {
+ throw new UnexpectedValueException();
+ } elseif ( in_array( $prop, $array_props, true ) && ! is_array( $this->$prop ) ) {
+ throw new UnexpectedValueException();
+ }
+ $this->$prop = null;
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Set the entire IRI. Returns true on success, false on failure (if there
</span><span class="cx" style="display: block; padding: 0 10px"> * are any invalid characters).
</span></span></pre></div>
<a id="trunksrcwpincludesRequestssrcSessionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/Requests/src/Session.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/Requests/src/Session.php 2023-10-12 12:29:18 UTC (rev 56834)
+++ trunk/src/wp-includes/Requests/src/Session.php 2023-10-12 12:32:43 UTC (rev 56835)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,6 +265,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return Requests::request_multiple($requests, $options);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __wakeup() {
+ throw new \LogicException( __CLASS__ . ' should never be unserialized' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Merge a request's data with the default data
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpblockpatternsregistryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-block-patterns-registry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-block-patterns-registry.php 2023-10-12 12:29:18 UTC (rev 56834)
+++ trunk/src/wp-includes/class-wp-block-patterns-registry.php 2023-10-12 12:32:43 UTC (rev 56835)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,6 +230,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return isset( $this->registered_patterns[ $pattern_name ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __wakeup() {
+ if ( ! $this->registered_patterns ) {
+ return;
+ }
+ if ( ! is_array( $this->registered_patterns ) ) {
+ throw new UnexpectedValueException();
+ }
+ foreach ( $this->registered_patterns as $value ) {
+ if ( ! is_array( $value ) ) {
+ throw new UnexpectedValueException();
+ }
+ }
+ $this->registered_patterns_outside_init = array();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Utility method to retrieve the main instance of the class.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpblocktyperegistryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-block-type-registry.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-block-type-registry.php 2023-10-12 12:29:18 UTC (rev 56834)
+++ trunk/src/wp-includes/class-wp-block-type-registry.php 2023-10-12 12:32:43 UTC (rev 56835)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,6 +168,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return isset( $this->registered_block_types[ $name ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __wakeup() {
+ if ( ! $this->registered_block_types ) {
+ return;
+ }
+ if ( ! is_array( $this->registered_block_types ) ) {
+ throw new UnexpectedValueException();
+ }
+ foreach ( $this->registered_block_types as $value ) {
+ if ( ! $value instanceof WP_Block_Type ) {
+ throw new UnexpectedValueException();
+ }
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Utility method to retrieve the main instance of the class.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme.php 2023-10-12 12:29:18 UTC (rev 56834)
+++ trunk/src/wp-includes/class-wp-theme.php 2023-10-12 12:32:43 UTC (rev 56835)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -773,6 +773,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 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();
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Adds theme data to cache.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Cache entries keyed by the theme and the type of data.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1918,4 +1940,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private static function _name_sort_i18n( $a, $b ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return strnatcasecmp( $a->name_translated, $b->name_translated );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ 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;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>