From 37b22fe542eb8f336c167c982bf458852e8b32b9 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 6 Mar 2024 21:08:46 +0100 Subject: fix unterminated entity reference error when dealing with domxpath and add a test --- include/html2bbcode.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/html2bbcode.php b/include/html2bbcode.php index e97748a59..c7fe981d0 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -77,12 +77,13 @@ function node2bbcodesub(&$doc, $oldnode, $attributes, $startbb, $endbb) // The exception is `
` and `` elements which
 					// should keep both newlines and whitespace intact.
 					if ($oldNode->nodeName != 'pre' && $oldNode->nodeName != 'code') {
+
 						$newNode->nodeValue = str_replace(
 							array("\n<", ">\n", "\r", "\n", "\xC3\x82\xC2\xA0"),
 							array("<", ">", "
", " ", ""),
-							$newNode->nodeValue);
+							htmlspecialchars($newNode->nodeValue, ENT_QUOTES, 'UTF-8', false));
 
-						$newNode->nodeValue = preg_replace('=[\s]{2,}=i', " ", $newNode->nodeValue);
+						$newNode->nodeValue = preg_replace('=[\s]{2,}=i', " ", htmlspecialchars($newNode->nodeValue, ENT_QUOTES, 'UTF-8', false));
 					}
 
 					$oldNode->parentNode->insertBefore($newNode, $oldNode);
-- 
cgit v1.2.3