jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: check values in inner class annotation (#1382)

Browse Source
This commit is contained in:
Skylot
2022-02-14 18:25:54 +00:00
parent 1a2e702b25
commit fe248d7098
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/DexAnnotationsConvert.java
+11 -6
View File
@@ -2,7 +2,6 @@ package jadx.plugins.input.dex.sections;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.slf4j.Logger;
@@ -20,6 +19,7 @@ import jadx.api.plugins.input.data.attributes.types.InnerClassesAttr;
import jadx.api.plugins.input.data.attributes.types.InnerClsInfo;
import jadx.api.plugins.input.data.attributes.types.SignatureAttr;
import jadx.api.plugins.utils.Utils;
import jadx.plugins.input.dex.sections.annotations.AnnotationsUtils;
public class DexAnnotationsConvert {
private static final Logger LOG = LoggerFactory.getLogger(DexAnnotationsConvert.class);
@@ -56,11 +56,16 @@ public class DexAnnotationsConvert {
break;
case "Ldalvik/annotation/InnerClass;":
Map<String, EncodedValue> values = annotation.getValues();
String name = (String) values.get("name").getValue();
int accFlags = (Integer) values.get("accessFlags").getValue();
Map<String, InnerClsInfo> map = Collections.singletonMap(cls, new InnerClsInfo(cls, null, name, accFlags));
attributes.add(new InnerClassesAttr(map));
try {
String name = AnnotationsUtils.getValue(annotation, "name", EncodedType.ENCODED_STRING, null);
int accFlags = AnnotationsUtils.getValue(annotation, "accessFlags", EncodedType.ENCODED_INT, 0);
if (name != null || accFlags != 0) {
InnerClsInfo innerClsInfo = new InnerClsInfo(cls, null, name, accFlags);
attributes.add(new InnerClassesAttr(Collections.singletonMap(cls, innerClsInfo)));
}
} catch (Exception e) {
LOG.warn("Failed to parse annotation: " + annotation, e);
}
break;
case "Ldalvik/annotation/AnnotationDefault;":
jadx-plugins/jadx-dex-input/src/main/java/jadx/plugins/input/dex/sections/annotations/AnnotationsUtils.java
+20
View File
@@ -0,0 +1,20 @@
package jadx.plugins.input.dex.sections.annotations;
import jadx.api.plugins.input.data.annotations.EncodedType;
import jadx.api.plugins.input.data.annotations.EncodedValue;
import jadx.api.plugins.input.data.annotations.IAnnotation;
public class AnnotationsUtils {
@SuppressWarnings("unchecked")
public static <T> T getValue(IAnnotation ann, String name, EncodedType type, T defValue) {
if (ann == null || ann.getValues() == null || ann.getValues().isEmpty()) {
return defValue;
}
EncodedValue encodedValue = ann.getValues().get(name);
if (encodedValue == null || encodedValue.getType() != type) {
return defValue;
}
return (T) encodedValue.getValue();
}
}