Fix possible out-of-bounds exception in HeatMapSeries HitTest (#1524)

oxyplot · Apr 30, 2020 · 458de6a · 458de6a
1 parent d9bc9a2
commit 458de6a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,6 +45,7 @@ All notable changes to this project will be documented in this file.
 - Custom tracker strings can cause exception in histogram chart (#1455)
 - OxyPlot.WindowsForms package description (#1457)
 - NullReference in VolumeSeries if no data in Items list (#1491)
+- Possible out-of-bounds exception in HeatMapSeries HitTest (#1524)
 
 ## [2.0.0] - 2019-10-19
 ### Added 

diff --git a/Source/OxyPlot/Series/HeatMapSeries.cs b/Source/OxyPlot/Series/HeatMapSeries.cs
@@ -384,6 +384,12 @@ public override TrackerHitResult GetNearestPoint(ScreenPoint point, bool interpo
                 point = this.Transform(p);
             }
 
+            // perform a second range check in index space to accomodate rounding
+            if (i < -0.5 || i > this.Data.GetLength(0) - 0.5 || j < -0.5 || j > this.Data.GetLength(1) - 0.5)
+            {
+                return null;
+            }
+
             var value = GetValue(this.Data, i, j);
             var colorAxis = this.ColorAxis as Axis;
             var colorAxisTitle = (colorAxis != null ? colorAxis.Title : null) ?? DefaultColorAxisTitle;