bug and remove debug code

diff --git a/Robust/src/Analysis/Disjoint/TaintSet.java b/Robust/src/Analysis/Disjoint/TaintSet.java
index 902bc498e7ede981accf81df5f1156f43af3c961..c5363794d447e25ae36d77eb232189b26a8b0e85 100644 (file)
--- a/Robust/src/Analysis/Disjoint/TaintSet.java
+++ b/Robust/src/Analysis/Disjoint/TaintSet.java
@@ -174,20 +174,6 @@ public class TaintSet extends Canonical {
   }
   
   public String toString() {
-    String s = "taints[";
-
-    Iterator<Taint> tItr = taints.iterator();
-    while( tItr.hasNext() ) {
-      Taint t = tItr.next();
-      if (t.toString().indexOf("applyCavity")!=-1) {
-       s += t.toString();
-       if( tItr.hasNext() ) {
-         s += ",\\n";
-       }
-      }
-    }
-    s += "]";
-    return s;
-    //    return taints.toString();
+    return taints.toString();
   }
 }

diff --git a/Robust/src/Analysis/Pointer/Edge.java b/Robust/src/Analysis/Pointer/Edge.java
index e8239036205acf16615b62361511f040759e7cc0..afbfffb8832cbc7bccf9bd5ffccbdc5522ebabc2 100644 (file)
--- a/Robust/src/Analysis/Pointer/Edge.java
+++ b/Robust/src/Analysis/Pointer/Edge.java
@@ -214,8 +214,8 @@ public class Edge {
       if ((mask&statuspredicate)==mask) {
        Edge e=new Edge();
        e.fd=fd;
-       e.src=factory.getAllocNode(src, (mask|3)==0);
-       e.dst=factory.getAllocNode(dst, (mask|5)==0);
+       e.src=factory.getAllocNode(src, (mask&3)==0);
+       e.dst=factory.getAllocNode(dst, (mask&5)==0);
        earray[edgeindex++]=e;
       }
       mask=mask<<1;