Magic-Mirror/jadx
1
0
Fork 0
mirror of https://github.com/skylot/jadx.git synced 2024-11-23 04:39:46 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: unwrap consts in switch-over-string (PR #2332)
Some checks failed
Build Artifacts / build (push) Waiting to run
Details
Build Artifacts / build-win-bundle (push) Waiting to run
Details
Build Test / tests (ubuntu-latest) (push) Waiting to run
Details
Build Test / tests (windows-latest) (push) Waiting to run
Details
CodeQL / Analyze (java) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
pubiqq 2024-11-01 00:24:19 +03:00 committed by GitHub
parent 7544d1a113
commit 39912398fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jadx-core/src/main/java/jadx/core/dex/visitors/regions/SwitchOverStringVisitor.java
View File

@ -12,6 +12,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.jetbrains.annotations.Nullable;
import jadx.api.plugins.input.data.annotations.EncodedType;
import jadx.api.plugins.input.data.attributes.JadxAttrType;
import jadx.core.dex.attributes.AFlag;
import jadx.core.dex.attributes.IAttributeNode;
import jadx.core.dex.attributes.nodes.CodeFeaturesAttr;
@ -26,6 +28,7 @@ import jadx.core.dex.instructions.args.InsnWrapArg;
import jadx.core.dex.instructions.args.LiteralArg;
import jadx.core.dex.instructions.args.RegisterArg;
import jadx.core.dex.instructions.args.SSAVar;
import jadx.core.dex.nodes.FieldNode;
import jadx.core.dex.nodes.IContainer;
import jadx.core.dex.nodes.IRegion;
import jadx.core.dex.nodes.InsnNode;
@ -217,8 +220,8 @@ public class SwitchOverStringVisitor extends AbstractVisitor implements IRegionI
for (SwitchRegion.CaseInfo caseInfo : codeSwitch.getCases()) {
CaseData prevCase = null;
for (Object key : caseInfo.getKeys()) {
if (key instanceof Integer) {
Integer intKey = (Integer) key;
final Integer intKey = unwrapIntKey(key);
if (intKey != null) {
CaseData caseData = casesMap.get(intKey);
if (caseData == null) {
return false;
@ -246,6 +249,21 @@ public class SwitchOverStringVisitor extends AbstractVisitor implements IRegionI
return true;
}
private Integer unwrapIntKey(Object key) {
if (key instanceof Integer) {
return (Integer) key;
} else if (key instanceof FieldNode) {
final var encodedValue = ((FieldNode) key).get(JadxAttrType.CONSTANT_VALUE);
if (encodedValue != null && encodedValue.getType() == EncodedType.ENCODED_INT) {
return (Integer) encodedValue.getValue();
} else {
return null;
}
}
return null;
}
private static Map<InsnNode, String> collectEqualsInsns(MethodNode mth, SSAVar strVar) {
Map<InsnNode, String> map = new IdentityHashMap<>(strVar.getUseCount() - 1);
for (RegisterArg useReg : strVar.getUseList()) {