<!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>[60887] trunk: HTML API: Ensure non-string HTML input is safely handled.</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/60887">60887</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/60887","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jonsurrell</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-10-01 12:57:19 +0000 (Wed, 01 Oct 2025)</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'>HTML API: Ensure non-string HTML input is safely handled.
Prevents an issue where passing `null` to HTML API constructors could result in runtime errors.
Developed in https://github.com/WordPress/wordpress-develop/pull/9545.
Props kraftbj, jonsurrell, westonruter.
Fixes <a href="https://core.trac.wordpress.org/ticket/63854">#63854</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludeshtmlapiclasswphtmlprocessorphp">trunk/src/wp-includes/html-api/class-wp-html-processor.php</a></li>
<li><a href="#trunksrcwpincludeshtmlapiclasswphtmltagprocessorphp">trunk/src/wp-includes/html-api/class-wp-html-tag-processor.php</a></li>
<li><a href="#trunktestsphpunittestshtmlapiwpHtmlProcessorphp">trunk/tests/phpunit/tests/html-api/wpHtmlProcessor.php</a></li>
<li><a href="#trunktestsphpunittestshtmlapiwpHtmlTagProcessorphp">trunk/tests/phpunit/tests/html-api/wpHtmlTagProcessor.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludeshtmlapiclasswphtmlprocessorphp"></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/html-api/class-wp-html-processor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/html-api/class-wp-html-processor.php 2025-10-01 00:13:35 UTC (rev 60886)
+++ trunk/src/wp-includes/html-api/class-wp-html-processor.php 2025-10-01 12:57:19 UTC (rev 60887)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,6 +297,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return null;
</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">+ if ( ! is_string( $html ) ) {
+ _doing_it_wrong(
+ __METHOD__,
+ __( 'The HTML parameter must be a string.' ),
+ '6.9.0'
+ );
+ return null;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $context_processor = static::create_full_parser( "<!DOCTYPE html>{$context}", $encoding );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null === $context_processor ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,6 +348,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'UTF-8' !== $known_definite_encoding ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return null;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_string( $html ) ) {
+ _doing_it_wrong(
+ __METHOD__,
+ __( 'The HTML parameter must be a string.' ),
+ '6.9.0'
+ );
+ return null;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $processor = new static( $html, self::CONSTRUCTOR_UNLOCK_CODE );
</span><span class="cx" style="display: block; padding: 0 10px"> $processor->state->encoding = $known_definite_encoding;
</span></span></pre></div>
<a id="trunksrcwpincludeshtmlapiclasswphtmltagprocessorphp"></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/html-api/class-wp-html-tag-processor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/html-api/class-wp-html-tag-processor.php 2025-10-01 00:13:35 UTC (rev 60886)
+++ trunk/src/wp-includes/html-api/class-wp-html-tag-processor.php 2025-10-01 12:57:19 UTC (rev 60887)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -834,6 +834,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $html HTML to process.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $html ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_string( $html ) ) {
+ _doing_it_wrong(
+ __METHOD__,
+ __( 'The HTML parameter must be a string.' ),
+ '6.9.0'
+ );
+ $html = '';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->html = $html;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestshtmlapiwpHtmlProcessorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/html-api/wpHtmlProcessor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/html-api/wpHtmlProcessor.php 2025-10-01 00:13:35 UTC (rev 60886)
+++ trunk/tests/phpunit/tests/html-api/wpHtmlProcessor.php 2025-10-01 12:57:19 UTC (rev 60887)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,6 +37,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">+ * @ticket 63854
+ *
+ * @covers ::create_fragment
+ * @expectedIncorrectUsage WP_HTML_Processor::create_fragment
+ */
+ public function test_create_fragment_validates_html_parameter() {
+ $processor = WP_HTML_Processor::create_fragment( null );
+ $this->assertNull( $processor );
+ }
+
+ /**
+ * @ticket 63854
+ *
+ * @covers ::create_full_parser
+ * @expectedIncorrectUsage WP_HTML_Processor::create_full_parser
+ */
+ public function test_create_full_parser_validates_html_parameter() {
+ $processor = WP_HTML_Processor::create_full_parser( null );
+ $this->assertNull( $processor );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Once stepping to the end of the document, WP_HTML_Processor::get_tag
</span><span class="cx" style="display: block; padding: 0 10px"> * should no longer report a tag. It should report `null` because there
</span><span class="cx" style="display: block; padding: 0 10px"> * is no tag matched or open.
</span></span></pre></div>
<a id="trunktestsphpunittestshtmlapiwpHtmlTagProcessorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/html-api/wpHtmlTagProcessor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/html-api/wpHtmlTagProcessor.php 2025-10-01 00:13:35 UTC (rev 60886)
+++ trunk/tests/phpunit/tests/html-api/wpHtmlTagProcessor.php 2025-10-01 12:57:19 UTC (rev 60887)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,6 +73,23 @@
</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">+ * @ticket 63854
+ *
+ * @covers WP_HTML_Tag_Processor::__construct
+ * @expectedIncorrectUsage WP_HTML_Tag_Processor::__construct
+ */
+ public function test_constructor_validates_html_parameter() {
+ // Test that passing null triggers _doing_it_wrong and sets HTML to empty string.
+ $processor = new WP_HTML_Tag_Processor( null );
+
+ // Verify that the HTML was set to an empty string.
+ $this->assertSame( '', $processor->get_updated_html(), 'HTML should be set to empty string when null is passed' );
+
+ // Verify that next_token() works without errors (indicating the processor is in a valid state).
+ $this->assertFalse( $processor->next_token(), 'next_token() should work without errors when HTML is empty string' );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Data provider. HTML tags which might have a self-closing flag, and an indicator if they do.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array[]
</span></span></pre>
</div>
</div>
</body>
</html>