Prevent hits overflow

Author: zuevmaxim

src/com/intellij/rt/coverage/data/ClassData.java

@@ -29,6 +29,11 @@
  * Represents a class in coverage engine.
  */
 public class ClassData implements CoverageData {
+  /**
+   * Hits value forced to be in [0, MAX_HITS] to prevent hits overflow.
+   */
+  private static final int MAX_HITS = 1000000000;
+
   private final String myClassName;
   private LineData[] myLinesArray;
   private Map<String, Integer> myStatus;
@@ -271,15 +276,27 @@ public void setTraceMask(boolean[] traceMask) {
     myTraceMask = traceMask;
   }
 
+  public static int trimHits(int hits) {
+    if (0 <= hits && hits <= MAX_HITS) return hits;
+    return MAX_HITS;
+  }
+
   public void applyHits() {
-    if (myHitsMask == null) return;
+    final int[] hits = myHitsMask;
+    if (hits == null) return;
+
+    for (int i = 0; i < hits.length; ++i) {
+      if (hits[i] < 0 || hits[i] > MAX_HITS) {
+        hits[i] = MAX_HITS;
+      }
+    }
     try {
       for (LineData lineData : myLinesArray) {
         if (lineData == null) continue;
         int lineId = lineData.getId();
         if (lineId != -1) {
-          lineData.setHits(lineData.getHits() + myHitsMask[lineId]);
-          myHitsMask[lineId] = 0;
+          lineData.setHits(lineData.getHits() + hits[lineId]);
+          hits[lineId] = 0;
         }
 
         JumpData[] jumps = lineData.getJumps();
@@ -288,13 +305,13 @@ public void applyHits() {
             if (jumpData == null) continue;
             int trueId = jumpData.getId(true);
             if (trueId != -1) {
-              jumpData.setTrueHits(jumpData.getTrueHits() + myHitsMask[trueId]);
-              myHitsMask[trueId] = 0;
+              jumpData.setTrueHits(jumpData.getTrueHits() + hits[trueId]);
+              hits[trueId] = 0;
             }
             int falseId = jumpData.getId(false);
             if (falseId != -1) {
-              jumpData.setFalseHits(jumpData.getFalseHits() + myHitsMask[falseId]);
-              myHitsMask[falseId] = 0;
+              jumpData.setFalseHits(jumpData.getFalseHits() + hits[falseId]);
+              hits[falseId] = 0;
             }
           }
         }
@@ -305,17 +322,17 @@ public void applyHits() {
             if (switchData == null) continue;
             int defaultId = switchData.getId(-1);
             if (defaultId != -1) {
-              switchData.setDefaultHits(switchData.getDefaultHits() + myHitsMask[defaultId]);
-              myHitsMask[defaultId] = 0;
+              switchData.setDefaultHits(switchData.getDefaultHits() + hits[defaultId]);
+              hits[defaultId] = 0;
             }
-            int[] hits = switchData.getHits();
-            for (int i = 0; i < hits.length; i++) {
+            int[] switchHits = switchData.getHits();
+            for (int i = 0; i < switchHits.length; i++) {
               int caseId = switchData.getId(i);
               if (caseId == -1) continue;
-              hits[i] += myHitsMask[caseId];
-              myHitsMask[caseId] = 0;
+              switchHits[i] += hits[caseId];
+              hits[caseId] = 0;
             }
-            switchData.setKeysAndHits(switchData.getKeys(), hits);
+            switchData.setKeysAndHits(switchData.getKeys(), switchHits);
           }
         }
       }

src/com/intellij/rt/coverage/data/JumpData.java

@@ -51,16 +51,16 @@ public void save(final DataOutputStream os) throws IOException {
 
   public void merge(final CoverageData data) {
     final JumpData jumpData = (JumpData) data;
-    myTrueHits += jumpData.myTrueHits;
-    myFalseHits += jumpData.myFalseHits;
+    setTrueHits(myTrueHits + jumpData.myTrueHits);
+    setFalseHits(myFalseHits + jumpData.myFalseHits);
   }
 
   public void setTrueHits(final int trueHits) {
-    myTrueHits = trueHits;
+    myTrueHits = ClassData.trimHits(trueHits);
   }
 
   public void setFalseHits(final int falseHits) {
-    myFalseHits = falseHits;
+    myFalseHits = ClassData.trimHits(falseHits);
   }
 
   public int getId(boolean type) {

src/com/intellij/rt/coverage/data/LineData.java

@@ -113,7 +113,7 @@ public void save(final DataOutputStream os) throws IOException {
 
   public void merge(final CoverageData data) {
     LineData lineData = (LineData) data;
-    myHits += lineData.myHits;
+    setHits(myHits + lineData.getHits());
     if (myJumpsAndSwitches != null || lineData.myJumpsAndSwitches != null) {
       getOrCreateJumpsAndSwitches().merge(lineData.getOrCreateJumpsAndSwitches());
     }
@@ -228,7 +228,7 @@ public BranchData getBranchData() {
   }
 
   public void setHits(final int hits) {
-    myHits = hits;
+    myHits = ClassData.trimHits(hits);
   }
 
   public void setTestName(String testName) {

src/com/intellij/rt/coverage/data/SwitchData.java

@@ -64,9 +64,9 @@ public void save(final DataOutputStream os) throws IOException {
 
   public void merge(final CoverageData data) {
     SwitchData switchData = (SwitchData) data;
-    myDefaultHits += switchData.myDefaultHits;
+    setDefaultHits(myDefaultHits + switchData.myDefaultHits);
     for (int i = Math.min(myHits.length, switchData.myHits.length) - 1; i >= 0; i--) {
-      myHits[i] += switchData.myHits[i];
+      myHits[i] = ClassData.trimHits(myHits[i] + switchData.myHits[i]);
     }
     if (switchData.myHits.length > myHits.length) {
       int[] old = myHits;
@@ -78,12 +78,15 @@ public void merge(final CoverageData data) {
   }
 
   public void setDefaultHits(final int defaultHits) {
-    myDefaultHits = defaultHits;
+    myDefaultHits = ClassData.trimHits(defaultHits);
   }
 
   public void setKeysAndHits(final int[] keys, final int[] hits) {
     myKeys = keys;
     myHits = hits;
+    for (int i = 0; i < myHits.length; i++) {
+      myHits[i] = ClassData.trimHits(myHits[i]);
+    }
   }
 
   public int[] getKeys() {