From 33e4ac5b220b0edbef6774b3d961a3313fbf76e9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Sat, 20 May 2017 00:45:48 +0200
Subject: [PATCH] Add \b to regexes in BlockLevelPass to avoid confusing tr &
 track

With TimedMediaHandler in video.js mode, videos can be inline,
without a wrapper div.

Previously, in this mode two paragraphs where one contained a
video would end up merged into one paragraph, due to BlockLevelPass
matching "<track .../>" against "<tr" in its regexes.

Added \b to a couple of the regexes to protect against such errors,
and corrected a parser test case that had bad output listed, where
"<link .../>" matched against "<li".

Bug: T165817
Change-Id: I06e82b881f5ebddae5e7df7fb940adfa54f6b659
---
 includes/parser/BlockLevelPass.php | 4 ++--
 tests/parser/parserTests.txt       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/parser/BlockLevelPass.php b/includes/parser/BlockLevelPass.php
index 2023d13445..599fbf61de 100644
--- a/includes/parser/BlockLevelPass.php
+++ b/includes/parser/BlockLevelPass.php
@@ -286,14 +286,14 @@ class BlockLevelPass {
 				# @todo consider using a stack for nestable elements like span, table and div
 				$openMatch = preg_match(
 					'/(?:<table|<h1|<h2|<h3|<h4|<h5|<h6|<pre|<tr|'
-						. '<p|<ul|<ol|<dl|<li|<\\/tr|<\\/td|<\\/th)/iS',
+						. '<p|<ul|<ol|<dl|<li|<\\/tr|<\\/td|<\\/th)\\b/iS',
 					$t
 				);
 				$closeMatch = preg_match(
 					'/(?:<\\/table|<\\/h1|<\\/h2|<\\/h3|<\\/h4|<\\/h5|<\\/h6|'
 						. '<td|<th|<\\/?blockquote|<\\/?div|<hr|<\\/pre|<\\/p|<\\/mw:|'
 						. Parser::MARKER_PREFIX
-						. '-pre|<\\/li|<\\/ul|<\\/ol|<\\/dl|<\\/?center)/iS',
+						. '-pre|<\\/li|<\\/ul|<\\/ol|<\\/dl|<\\/?center)\\b/iS',
 					$t
 				);
 
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 2d107e7752..368dc0d213 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -17552,10 +17552,10 @@ Sanitizer: Validating that <meta> and <link> work, but only for Microdata
 <p>	<meta itemprop="hello" content="world" />
 	&lt;meta http-equiv="refresh" content="5"&gt;
 	<meta itemprop="hello" content="5" />
-</p>
 	<link itemprop="hello" href="http&#58;//example.org" />
 	&lt;link rel="stylesheet" href="<a rel="nofollow" class="external free" href="http://example.org">http://example.org</a>"&gt;
 	<link itemprop="hello" href="http&#58;//example.org" />
+</p>
 </div>
 
 !! end
-- 
2.20.1