Skip to content

Commit 6c7ffe2

Browse files
Make Prototype.ScriptFragment properly handle whitespace in a closing SCRIPT tag. [#1297 state:resolved] (piopier, Victor)
1 parent 43adb8b commit 6c7ffe2

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/prototype/prototype.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ var Prototype = {
139139
})()
140140
},
141141

142-
ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>',
142+
ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script\\s*>',
143143
JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
144144

145145
/**

test/unit/string_test.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,9 @@ new Test.Unit.Runner({
215215
this.assertEqual('foo bar', 'foo bar'.stripScripts());
216216
this.assertEqual('foo bar', ('foo <script>boo();<'+'/script>bar').stripScripts());
217217
this.assertEqual('foo bar', ('foo <script type="text/javascript">boo();\nmoo();<'+'/script>bar').stripScripts());
218+
219+
this.assertEqual('foo bar', ('foo <script>boo();<'+'/script >bar').stripScripts(),
220+
'should properly handle whitespace in closing tag');
218221
},
219222

220223
testExtractScripts: function() {

0 commit comments

Comments
 (0)