fix alias edge bug

wh1t3p1g · wh1t3p1g · commit 609d812a710e · 2022-04-10T21:58:37.000+08:00
diff --git a/src/main/java/tabby/core/container/DataContainer.java b/src/main/java/tabby/core/container/DataContainer.java
@@ -317,6 +317,31 @@ public MethodReference getFirstMethodRefFromFatherNodes(SootClass cls, String su
         return null;
     }
 
+    public Set<MethodReference> getAliasMethodRefs(SootClass cls, String subSignature){
+        Set<MethodReference> refs = new HashSet<>();
+        Set<SootClass> classes = new HashSet<>();
+
+        if(cls.hasSuperclass()){
+            classes.add(cls.getSuperclass());
+        }
+
+        if(cls.getInterfaceCount() > 0){
+            classes.addAll(cls.getInterfaces());
+        }
+
+        MethodReference ref = null;
+
+        for(SootClass clazz:classes){
+            ref = getMethodRefBySubSignature(clazz.getName(), subSignature);
+            if(ref != null){
+                refs.add(ref);
+            }else{
+                refs.addAll(getAliasMethodRefs(clazz, subSignature));
+            }
+        }
+        return refs;
+    }
+
     private MethodReference getTargetMethodRef(SootClass cls, String subSignature, boolean deepFirst){
         MethodReference target = null;
         if(deepFirst){
diff --git a/src/main/java/tabby/core/scanner/ClassInfoScanner.java b/src/main/java/tabby/core/scanner/ClassInfoScanner.java
@@ -198,15 +198,17 @@ public static void makeAliasRelation(Has has, DataContainer dataContainer){
         if(currentSootMethod == null) return;
 
         SootClass cls = currentSootMethod.getDeclaringClass();
-        MethodReference fatherNodeMethodRef
-                = dataContainer.getFirstMethodRefFromFatherNodes(
-                cls, currentSootMethod.getSubSignature(), false);
 
-        if(fatherNodeMethodRef != null){
-            Alias alias = Alias.newInstance(fatherNodeMethodRef, currentMethodRef);
-            fatherNodeMethodRef.getChildAliasEdges().add(alias);
+        Set<MethodReference> refs =
+                dataContainer.getAliasMethodRefs(cls, currentSootMethod.getSubSignature());
+
+        if(refs != null && !refs.isEmpty()){
+            for(MethodReference ref:refs){
+                Alias alias = Alias.newInstance(ref, currentMethodRef);
+                ref.getChildAliasEdges().add(alias);
 //            currentMethodRef.setAliasEdge(alias);
-            dataContainer.store(alias);
+                dataContainer.store(alias);
+            }
         }
     }
 
