MDL-37283 import tinymce spellchecker 2.0.6.1

diff --git a/lib/editor/tinymce/plugins/spellchecker/changelog.txt b/lib/editor/tinymce/plugins/spellchecker/changelog.txt
index ed606cf..afe04fb 100644 (file)
--- a/lib/editor/tinymce/plugins/spellchecker/changelog.txt
+++ b/lib/editor/tinymce/plugins/spellchecker/changelog.txt
@@ -1,3 +1,5 @@
+Version 2.0.6.1 (2012-11-16)\r
+       Fixed security issue with google spellchecker.\r
 Version 2.0.6 (2011-09-29)\r
        Fixed incorrect position of suggestion menu.\r
        Fixed handling of mispelled words with no suggestions in PSpellShell engine.\r

diff --git a/lib/editor/tinymce/plugins/spellchecker/classes/GoogleSpell.php b/lib/editor/tinymce/plugins/spellchecker/classes/GoogleSpell.php
index e3acf2d..f96d4a9 100644 (file)
--- a/lib/editor/tinymce/plugins/spellchecker/classes/GoogleSpell.php
+++ b/lib/editor/tinymce/plugins/spellchecker/classes/GoogleSpell.php
@@ -51,6 +51,8 @@ class GoogleSpell extends SpellChecker {
        }\r
 \r
        function &_getMatches($lang, $str) {\r
+               $lang = preg_replace('/[^a-z\-]/i', '', $lang); // Sanitize, remove everything but a-z or -\r
+               $str = preg_replace('/[\x00-\x1F\x7F]/', '', $str); // Sanitize, remove all control characters\r
                $server = "www.google.com";\r
                $port = 443;\r
                $path = "/tbproxy/spell?lang=" . $lang . "&hl=en";\r