Merge pull request #275 from Nizernizer/feat/issue-270

change stats

Author: Nizernizer

dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/SpyDispatcherImpl.java

@@ -369,4 +369,4 @@ public boolean collectMethodPool(Object instance, Object[] argumentArray, Object
         }
         return false;
     }
-}
+}

dongtai-core/src/main/java/io/dongtai/iast/core/utils/threadlocal/IastTaintPool.java

@@ -3,6 +3,8 @@
 import io.dongtai.iast.core.EngineManager;
 import io.dongtai.iast.core.utils.PropertyUtils;
 import io.dongtai.iast.core.handler.hookpoint.models.MethodEvent;
+import io.dongtai.log.DongTaiLog;
+
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -29,55 +31,59 @@ protected HashSet<Object> initialValue() {
      * @param obj source点的污点
      */
     public void addTaintToPool(Object obj, MethodEvent event, boolean isSource) {
-        int subHashCode = 0;
-        if (obj instanceof String[]) {
-            this.get().add(obj);
-            event.addTargetHash(obj.hashCode());
+        try{
+            int subHashCode = 0;
+            if (obj instanceof String[]) {
+                this.get().add(obj);
+                event.addTargetHash(obj.hashCode());
 
-            String[] tempObjs = (String[]) obj;
-            if (PROPERTIES.isNormalMode()) {
-                for (String tempObj : tempObjs) {
-                    this.get().add(tempObj);
-                    subHashCode = System.identityHashCode(tempObj);
-                    EngineManager.TAINT_HASH_CODES.get().add(subHashCode);
-                    event.addTargetHash(subHashCode);
-                }
-            } else {
-                for (String tempObj : tempObjs) {
-                    this.get().add(tempObj);
-                    event.addTargetHash(tempObj.hashCode());
+                String[] tempObjs = (String[]) obj;
+                if (PROPERTIES.isNormalMode()) {
+                    for (String tempObj : tempObjs) {
+                        this.get().add(tempObj);
+                        subHashCode = System.identityHashCode(tempObj);
+                        EngineManager.TAINT_HASH_CODES.get().add(subHashCode);
+                        event.addTargetHash(subHashCode);
+                    }
+                } else {
+                    for (String tempObj : tempObjs) {
+                        this.get().add(tempObj);
+                        event.addTargetHash(tempObj.hashCode());
+                    }
                 }
-            }
-        } else if (obj instanceof Map) {
-            this.get().add(obj);
-            event.addTargetHash(obj.hashCode());
-            if (isSource) {
-                Map<String, String[]> tempMap = (Map<String, String[]>) obj;
-                Set<Map.Entry<String, String[]>> entries = tempMap.entrySet();
-                for (Map.Entry<String, String[]> entry : entries) {
-                    Object key = entry.getKey();
-                    Object value = entry.getValue();
-                    addTaintToPool(key, event, true);
-                    addTaintToPool(value, event, true);
+            } else if (obj instanceof Map) {
+                this.get().add(obj);
+                event.addTargetHash(obj.hashCode());
+                if (isSource) {
+                    Map<String, String[]> tempMap = (Map<String, String[]>) obj;
+                    Set<Map.Entry<String, String[]>> entries = tempMap.entrySet();
+                    for (Map.Entry<String, String[]> entry : entries) {
+                        Object key = entry.getKey();
+                        Object value = entry.getValue();
+                        addTaintToPool(key, event, true);
+                        addTaintToPool(value, event, true);
+                    }
                 }
-            }
-        } else if (obj.getClass().isArray() && !obj.getClass().getComponentType().isPrimitive()) {
-            Object[] tempObjs = (Object[]) obj;
-            if (tempObjs.length != 0) {
-                for (Object tempObj : tempObjs) {
-                    addTaintToPool(tempObj, event, isSource);
+            } else if (obj.getClass().isArray() && !obj.getClass().getComponentType().isPrimitive()) {
+                Object[] tempObjs = (Object[]) obj;
+                if (tempObjs.length != 0) {
+                    for (Object tempObj : tempObjs) {
+                        addTaintToPool(tempObj, event, isSource);
+                    }
                 }
-            }
-        } else {
-            this.get().add(obj);
-            if (obj instanceof String && PROPERTIES.isNormalMode()) {
-                subHashCode = System.identityHashCode(obj);
-                EngineManager.TAINT_HASH_CODES.get().add(subHashCode);
             } else {
-                subHashCode = obj.hashCode();
-            }
-            event.addTargetHash(subHashCode);
+                this.get().add(obj);
+                if (obj instanceof String && PROPERTIES.isNormalMode()) {
+                    subHashCode = System.identityHashCode(obj);
+                    EngineManager.TAINT_HASH_CODES.get().add(subHashCode);
+                } else {
+                    subHashCode = obj.hashCode();
+                }
+                event.addTargetHash(subHashCode);
 
+            }
+        }catch (Exception e){
+            DongTaiLog.debug(e);
         }
     }