Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix handling of descriptors which are type-only #37

Merged
merged 1 commit into from
Feb 1, 2024
Merged

Fix handling of descriptors which are type-only #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 39 additions & 2 deletions ...src/main/java/com/synopsys/method/analyzer/core/bytecode/ClassMethodReferenceVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.google.common.collect.Multimap;
import com.synopsys.method.analyzer.core.model.MethodUse;
Expand Down Expand Up @@ -120,6 +122,9 @@ private static String formatQualifiedName(String internalName) {
*/
private static class MethodReferenceVisitor extends MethodVisitor {

/** Logger reference to output information to the application log files */
private final Logger logger = LoggerFactory.getLogger(getClass());

private final MethodReferenceRegistry referenceRegistry;

private final String currentClassName;
Expand Down Expand Up @@ -194,8 +199,8 @@ private void register(String owner, String name, String descriptor) {
// Treat all arrays as "object", instead of a unique array "class"
String effectiveOwner = (owner.startsWith("[") ? "java/lang/Object" : owner);

Type returnType = Type.getReturnType(descriptor);
Type[] arguments = Type.getArgumentTypes(descriptor);
Type returnType = getReturnType(descriptor);
Type[] arguments = getArgumentTypes(descriptor);

List<String> argumentList = Stream.of(arguments)
.map(Type::getClassName)
Expand All @@ -206,6 +211,38 @@ private void register(String owner, String name, String descriptor) {
referenceRegistry.registerReference(formatQualifiedName(effectiveOwner), name, argumentList, returnType.getClassName(), useReference, currentLine);
}

private Type getReturnType(String descriptor) {
try {
return Type.getReturnType(descriptor);
} catch (StringIndexOutOfBoundsException e) {
// IDETECT-3909 This can occur for malformed signatures which are just the type, not the method, for an
// unknown reason
logger.warn("Malformed method descriptor, attempting type-only processing: {}:{} ({})", currentClassName, currentMethodName, descriptor);

try {
return Type.getType(descriptor);
} catch (StringIndexOutOfBoundsException e2) {
// IDETECT-3909 This can occur for malformed signatures which are just the type, not the method, for
// an unknown reason
logger.warn("Malformed method descriptor, skipping reference processing: {}:{} ({})", currentClassName, currentMethodName, descriptor);

return Type.getType(descriptor);
}
}
}

private Type[] getArgumentTypes(String descriptor) {
try {
return Type.getArgumentTypes(descriptor);
} catch (StringIndexOutOfBoundsException e) {
// IDETECT-3909 This can occur for malformed signatures which are just the type, not the method, for an
// unknown reason
logger.warn("Malformed method descriptor, skipping arguments: {}:{} ({})", currentClassName, currentMethodName, descriptor);

return new Type[] {};
}
}

}

}