Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/225016
Change subject: Fix crash on __proto__
......................................................................
Fix crash on __proto__
__proto__ is a legacy property that allows getting the prototype
from the instance. This caused it to falsely appear to be a
valid magic word (since obj['__proto__'] was truthy)
Change-Id: I2c10c7952c6845c9f90decb718339366f2580d57
---
M lib/mediawiki.WikiConfig.js
M tests/parserTests.txt
2 files changed, 15 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/16/225016/1
diff --git a/lib/mediawiki.WikiConfig.js b/lib/mediawiki.WikiConfig.js
index 0429ae1..e1feb48 100644
--- a/lib/mediawiki.WikiConfig.js
+++ b/lib/mediawiki.WikiConfig.js
@@ -485,7 +485,11 @@
* @returns {string}
*/
WikiConfig.prototype.getMagicWordIdFromAlias = function( alias ) {
- return this.magicWords[alias] || null;
+ if ( this.magicWords.hasOwnProperty( alias ) ) {
+ return this.magicWords[alias];
+ } else {
+ return null;
+ }
};
/**
@@ -495,7 +499,7 @@
* @returns {string}
*/
WikiConfig.prototype.magicWordCanonicalName = function( word ) {
- return this.magicWords[word] || this.magicWords[word.toLowerCase()] ||
null;
+ return this.getMagicWordIdFromAlias( word ) ||
this.getMagicWordIdFromAlias( word.toLowerCase() );
};
/**
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 820c8e1..7caac34 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -14610,6 +14610,15 @@
!! end
+!!test
+__proto__ is treated as normal wikitext
+!!wikitext
+__proto__
+!!html
+<p>__proto__</p>
+
+!!end
+
!! test
Single-line or multiline-comments can follow headings
!! options
--
To view, visit https://gerrit.wikimedia.org/r/225016
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c10c7952c6845c9f90decb718339366f2580d57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
