Fixed possible AOOBE when averaging the analog signal.

stefanct · Feb 24, 2012 · 234f8b3 · 234f8b3
1 parent 4fd128d
commit 234f8b3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/client/src/main/java/nl/lxtreme/ols/client/signaldisplay/laf/SignalUI.java b/client/src/main/java/nl/lxtreme/ols/client/signaldisplay/laf/SignalUI.java
@@ -608,8 +608,10 @@ private void paintSignals( final Graphics2D aCanvas, final SignalViewModel aMode
           for ( int sampleIdx = startIdx; sampleIdx < endIdx; sampleIdx += sampleIncr )
           {
             long timestamp = timestamps[sampleIdx];
+
             int sampleValue = 0;
-            for ( int i = sampleIdx + 1; i < ( ( sampleIdx + sampleIncr ) - 1 ); i++ )
+            final int i_max = Math.min( endIdx, ( sampleIdx + sampleIncr ) - 1 );
+            for ( int i = sampleIdx + 1; i < i_max; i++ )
             {
               sampleValue += ( ( values[i] & mask ) >> trailingZeros );
             }