Skip to content

Commit

Permalink
[BUG] 避免 advanceStringName 和混淆标识符冲突
Browse files Browse the repository at this point in the history
  • Loading branch information
4ra1n committed Dec 12, 2024
1 parent d30a741 commit 274ef09
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 0 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# CHANGELOG

## 1.1.2

更新日志:

- [BUG] 避免 `advanceStringName` 和混淆标识符冲突

感谢以下用户的贡献:

- 4ra1n (https://github.com/4ra1n)

可供下载的文件都由 `Github Actions` 构建,使用 `java -jar class-obf.jar` 启动

## 1.1.1

更新日志:
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/me/n1ar4/clazz/obfuscator/config/Manager.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ public static boolean initConfig(BaseConfig config) {
}

JunkCodeChanger.MAX_JUNK_NUM = config.getMaxJunkOneClass();

// 修复 BUG 2024/12/13
// field / method 都不应该包含这个字符串
NameUtil.exclude(config.getAdvanceStringName());
ObfEnv.ADVANCE_STRING_NAME = config.getAdvanceStringName();

return true;
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/me/n1ar4/clazz/obfuscator/utils/NameUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ public class NameUtil {
private static final HashSet<String> generatedFields = new HashSet<>();
private static final HashSet<String> packageNames = new HashSet<>();

public static void exclude(String s) {
generatedStrings.add(s);
generatedMethods.add(s);
generatedFields.add(s);
packageNames.add(s);
}

public static String genNewName() {
return genBase(1);
}
Expand Down

0 comments on commit 274ef09

Please sign in to comment.