commit 868afbb10962a16685eab394f78577c6e6bd55d7
author Dirk Fauth <dirk.fauth@googlemail.com> Fri Oct 02 08:55:01 2020 +0200
committer Dirk Fauth <dirk.fauth@googlemail.com> Fri Oct 02 08:55:01 2020 +0200
tree 5d9004638939958471acb039dcdc7abce9c1e734
parent 3107894d1004d7bbcc773f6c87572c20b2fae4a2

Bug 567540 - StackOverflow in findColumnPosition/findRowPosition

Change-Id: Ie82de178541bfdf0a5192c7b1d5d735159d5de69
Signed-off-by: Dirk Fauth <dirk.fauth@googlemail.com>

org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/layer/LayerUtil.java

diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/layer/LayerUtil.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/layer/LayerUtil.java
index 20d6446..e870dff 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/layer/LayerUtil.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/layer/LayerUtil.java
@@ -46,6 +46,10 @@
     protected static final int findColumnPosition(
             int xOffset, int columnOffset, ILayer layer, int x, int totalWidth, int columnCount) {
 
+        if (columnOffset == columnCount) {
+            return columnCount;
+        }
+
         double size = (double) (totalWidth - xOffset) / (columnCount - columnOffset);
         int columnPosition = columnOffset + (int) ((x - xOffset) / size);
 
@@ -76,6 +80,10 @@
     protected static final int findRowPosition(
             int yOffset, int rowOffset, ILayer layer, int y, int totalHeight, int rowCount) {
 
+        if (rowOffset == rowCount) {
+            return rowCount;
+        }
+
         double size = (double) (totalHeight - yOffset) / (rowCount - rowOffset);
         int rowPosition = rowOffset + (int) ((y - yOffset) / size);