LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-28 10:17:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #2076 Auto rename identifiers infinite loop caused by renaming in playerglobal library

Browse Source
This commit is contained in:
Jindra Petřík
2023-09-23 18:12:28 +02:00
parent 6733d305bb
commit 302c909566
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
View File

@@ -502,14 +502,16 @@ public final class SWF implements SWFContainerItem, Timelined, Openable {
if (Configuration.getPlayerSWC() != null) {
SWC swc = new SWC(new FileInputStream(Configuration.getPlayerSWC()));
SWF swf = new SWF(swc.getOpenable("library.swf"), true);
//set allowRenameIdentifiers parameter to FALSE otherwise there will be an infinite loop
SWF swf = new SWF(swc.getOpenable("library.swf"), null, null, null, true, false, true, null, Charset.defaultCharset().name(), false);
playerGlobalAbcIndex = new AbcIndexing(swf);
}
}
if (airGlobalAbcIndex == null) {
if (Configuration.getAirSWC() != null) {
SWC swc = new SWC(new FileInputStream(Configuration.getAirSWC()));
SWF swf = new SWF(swc.getOpenable("library.swf"), true);
//set allowRenameIdentifiers to FALSE
SWF swf = new SWF(swc.getOpenable("library.swf"), null, null, null, true, false, true, null, Charset.defaultCharset().name(), false);
airGlobalAbcIndex = new AbcIndexing(swf);
}
}
@@ -1452,17 +1454,20 @@ public final class SWF implements SWFContainerItem, Timelined, Openable {
}
public SWF(InputStream is, String file, String fileTitle, ProgressListener listener, boolean parallelRead, boolean checkOnly, boolean lazy, String charset) throws IOException, InterruptedException {
this(is, file, fileTitle, listener, parallelRead, checkOnly, lazy, null, charset);
this(is, file, fileTitle, listener, parallelRead, checkOnly, lazy, null, charset, true);
}
public SWF(InputStream is, String file, String fileTitle, ProgressListener listener, boolean parallelRead, boolean checkOnly, boolean lazy) throws IOException, InterruptedException {
this(is, file, fileTitle, listener, parallelRead, checkOnly, lazy, null, Charset.defaultCharset().name());
this(is, file, fileTitle, listener, parallelRead, checkOnly, lazy, null, Charset.defaultCharset().name(), true);
}
public SWF(InputStream is, String file, String fileTitle, ProgressListener listener, boolean parallelRead, boolean checkOnly, boolean lazy, UrlResolver resolver) throws IOException, InterruptedException {
this(is, file, fileTitle, listener, parallelRead, checkOnly, lazy, resolver, Charset.defaultCharset().name());
this(is, file, fileTitle, listener, parallelRead, checkOnly, lazy, resolver, Charset.defaultCharset().name(), true);
}
public SWF(InputStream is, String file, String fileTitle, ProgressListener listener, boolean parallelRead, boolean checkOnly, boolean lazy, UrlResolver resolver, String charset) throws IOException, InterruptedException {
this(is, file, fileTitle, listener, parallelRead,checkOnly, lazy, resolver, charset, true);
}
/**
* Construct SWF from stream
*
@@ -1474,10 +1479,12 @@ public final class SWF implements SWFContainerItem, Timelined, Openable {
* @param checkOnly Check only file validity
* @param lazy
* @param resolver Resolver for imported tags
* @param charset Character set for all texts (for older SWF versions)
* @param allowRenameIdentifiers Allow auto renaming identifiers when enabled
* @throws IOException
* @throws java.lang.InterruptedException
*/
public SWF(InputStream is, String file, String fileTitle, ProgressListener listener, boolean parallelRead, boolean checkOnly, boolean lazy, UrlResolver resolver, String charset) throws IOException, InterruptedException {
public SWF(InputStream is, String file, String fileTitle, ProgressListener listener, boolean parallelRead, boolean checkOnly, boolean lazy, UrlResolver resolver, String charset, boolean allowRenameIdentifiers) throws IOException, InterruptedException {
this.file = file;
this.fileTitle = fileTitle;
this.charset = charset;
@@ -1538,7 +1545,7 @@ public final class SWF implements SWFContainerItem, Timelined, Openable {
}
}
if (Configuration.autoRenameIdentifiers.get()) {
if (allowRenameIdentifiers && Configuration.autoRenameIdentifiers.get()) {
deobfuscateIdentifiers(RenameType.TYPENUMBER);
AbcMultiNameCollisionFixer collisionFixer = new AbcMultiNameCollisionFixer();
collisionFixer.fixCollisions(this);