jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/344289 )
Change subject: RemexCompatMunger: fix a couple of memory leaks
......................................................................
RemexCompatMunger: fix a couple of memory leaks
Change-Id: I47578b3f73320e84a157417c288de97b5d26e18f
---
M includes/tidy/RemexCompatMunger.php
1 file changed, 8 insertions(+), 2 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/tidy/RemexCompatMunger.php
b/includes/tidy/RemexCompatMunger.php
index d5f5c28..dbcf568 100644
--- a/includes/tidy/RemexCompatMunger.php
+++ b/includes/tidy/RemexCompatMunger.php
@@ -229,7 +229,6 @@
* @param integer $sourceStart
* @param integer $sourceLength
*/
-
public function insertElement( $preposition, $refElement, Element
$element, $void,
$sourceStart, $sourceLength
) {
@@ -248,9 +247,10 @@
$newParent = $this->serializer->getParentNode( $parent
);
$parent = $newParent;
$parentData = $parent->snData;
+ $pElement = $parentData->childPElement;
$parentData->childPElement = null;
$newRef = $refElement->userData;
- // FIXME cannot call endTag() since we don't have an
Element
+ $this->endTag( $pElement, $sourceStart, 0 );
} elseif ( $under && $parentData->isSplittable
&& (bool)$parentData->ancestorPNode !== $inline
) {
@@ -425,7 +425,13 @@
}
public function endTag( Element $element, $sourceStart, $sourceLength )
{
+ $data = $element->userData->snData;
+ if ( $data->childPElement ) {
+ $this->endTag( $data->childPElement, $sourceStart, 0 );
+ }
$this->serializer->endTag( $element, $sourceStart,
$sourceLength );
+ $element->userData->snData = null;
+ $element->userData = null;
}
public function doctype( $name, $public, $system, $quirks,
$sourceStart, $sourceLength ) {
--
To view, visit https://gerrit.wikimedia.org/r/344289
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I47578b3f73320e84a157417c288de97b5d26e18f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
