Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use 100ms timeout on infinite loop protection, and don't mess with HT…
…ML or CSS.
- Loading branch information
Tom Ashworth
committed
Jul 15, 2013
1 parent
cac74a4
commit b35d186
Showing
11 changed files
with
158 additions
and
138 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /** | ||
| * Protect against infinite loops. | ||
| * Look for for, while and do loops, and insert a check function at the start of | ||
| * the loop. If the check function is called many many times then it returns | ||
| * true, preventing the loop from running again. | ||
| */ | ||
| var loopProtect = (function () { | ||
|
|
||
| var loopProtect = {}; | ||
|
|
||
| // used in the loop detection | ||
| loopProtect.counters = {}; | ||
|
|
||
| /** | ||
| * Look for for, while and do loops, and inserts *just* at the start of the | ||
| * loop, a check function. | ||
| */ | ||
| loopProtect.rewriteLoops = function (code, offset) { | ||
| var recompiled = [], | ||
| lines = code.split('\n'), | ||
| re = /for\b|while\b|do\b/; | ||
|
|
||
| if (!offset) offset = 0; | ||
|
|
||
| var method = 'window.runnerWindow.protect'; | ||
|
|
||
| lines.forEach(function (line, i) { | ||
| var index = 0, | ||
| lineNum = i - offset; | ||
|
|
||
| if (re.test(line) && line.indexOf('jsbin') === -1) { | ||
| // try to insert the tracker after the openning brace (like while (true) { ^here^ ) | ||
| index = line.indexOf('{'); | ||
| if (index !== -1) { | ||
| line = line.substring(0, index + 1) + ';\nif (' + method + '({ line: ' + lineNum + ' })) break;'; | ||
| } else { | ||
| index = line.indexOf(')'); | ||
| if (index !== -1) { | ||
| // look for a one liner | ||
| var colonIndex = line.substring(index).indexOf(';'); | ||
| if (colonIndex !== -1) { | ||
| // in which case, rewrite the loop to add braces | ||
| colonIndex += index; | ||
| line = line.substring(0, index + 1) + '{\nif (' + method + '({ line: ' + lineNum + ' })) break;\n' + line.substring(index + 1) + '\n}\n'; // extra new lines ensure we clear comment lines | ||
| } | ||
| } | ||
| } | ||
|
|
||
| line = ';' + method + '({ line: ' + lineNum + ', reset: true });\n' + line; | ||
| loopProtect.counters[lineNum] = {}; | ||
| } | ||
| recompiled.push(line); | ||
| }); | ||
|
|
||
| return recompiled.join('\n'); | ||
| }; | ||
|
|
||
| /** | ||
| * Injected code in to user's code to **try** to protect against infinite | ||
| * loops cropping up in the code, and killing the browser. Returns true | ||
| * when the loops has been running for more than 100ms. | ||
| */ | ||
| loopProtect.protect = function (state) { | ||
| loopProtect.counters[state.line] = loopProtect.counters[state.line] || {}; | ||
| var line = loopProtect.counters[state.line]; | ||
| if (state.reset) { | ||
| line.time = +new Date; | ||
| } | ||
| if ((+new Date - line.time) > 100) { | ||
| // We've spent over 100ms on this loop... smells infinite. | ||
| var msg = "Suspicious loop detected at line " + state.line; | ||
| if (window.proxyConsole) { | ||
| window.proxyConsole.error(msg); | ||
| } else console.error(msg); | ||
| // Returning true prevents the loop running again | ||
| return true; | ||
| } | ||
| return false; | ||
| }; | ||
|
|
||
| loopProtect.reset = function () { | ||
| // reset the counters | ||
| loopProtect.counters = {}; | ||
| }; | ||
|
|
||
| return loopProtect; | ||
|
|
||
| }()); | ||
|
|
||
| if (typeof exports !== 'undefined') { | ||
| module.exports = loopProtect; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| --require should sinon | ||
| --require should | ||
| --reporter spec | ||
| --ui bdd |
Oops, something went wrong.