Magic-Mirror/js-beautify
1
0
Fork 0
mirror of https://github.com/beautifier/js-beautify.git synced 2025-03-04 02:58:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Slightly refactor how unpackers are applied

Browse Source 
Fixes some weird freezes, e.g

    {"url":"{%%}{%%}"}

got detected by urlencoded script, but, being unable to urldecode, fell
into an infinite loop.
This commit is contained in:
Einar Lielmanis 2013-03-13 11:26:35 +02:00
parent 849787ea11
commit 31a4e90c03
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
index.html
View File

@ -171,10 +171,12 @@ function store_settings_to_cookie() {
}
function unpacker_filter(source) {
var trailing_comments = '';
var comment = '';
var found = false;
var trailing_comments = '',
comment = '',
unpacked = '',
found = false;
// cut trailing comments
do {
found = false;
if (/^\s*\/\*/.test(source)) {
@ -190,22 +192,15 @@ function unpacker_filter(source) {
}
} while (found);
if (P_A_C_K_E_R.detect(source)) {
// P.A.C.K.E.R unpacking may fail, even though it is detected
var unpacked = P_A_C_K_E_R.unpack(source);
if (unpacked != source) {
source = unpacker_filter(unpacked);
var unpackers = [P_A_C_K_E_R, Urlencoded, JavascriptObfuscator, MyObfuscate];
for (var i = 0; i < unpackers.length; i++) {
if (unpackers[i].detect(source)) {
unpacked = unpackers[i].unpack(source);
if (unpacked != source) {
source = unpacker_filter(unpacked);
}
}
}
if (Urlencoded.detect(source)) {
source = unpacker_filter(Urlencoded.unpack(source))
}
if (JavascriptObfuscator.detect(source)) {
source = unpacker_filter(JavascriptObfuscator.unpack(source))
}
if (MyObfuscate.detect(source)) {
source = unpacker_filter(MyObfuscate.unpack(source))
}
return trailing_comments + source;
}