summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authortreectrl <treectrl>2008-10-08 19:22:11 (GMT)
committertreectrl <treectrl>2008-10-08 19:22:11 (GMT)
commit5bfe04b4d0f9490c13e062f2f02a4b096fcd5795 (patch)
tree178bc5dcb149ecbf4655742afe6e69ba8a87a05f /generic
parent31c7995c7fd4a12261644a984cfa9d17f5ee32d3 (diff)
downloadtktreectrl-5bfe04b4d0f9490c13e062f2f02a4b096fcd5795.zip
tktreectrl-5bfe04b4d0f9490c13e062f2f02a4b096fcd5795.tar.gz
tktreectrl-5bfe04b4d0f9490c13e062f2f02a4b096fcd5795.tar.bz2
Fixed [Bug 1915466] panic in Range_ItemUnderPoint thanks to Mats Bengtsson (I think) who submitted the fix.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkTreeDisplay.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkTreeDisplay.c b/generic/tkTreeDisplay.c
index fcdf58e..8ad6c09 100644
--- a/generic/tkTreeDisplay.c
+++ b/generic/tkTreeDisplay.c
@@ -5,7 +5,7 @@
*
* Copyright (c) 2002-2008 Tim Baker
*
- * RCS: @(#) $Id: tkTreeDisplay.c,v 1.86 2008/07/21 18:42:54 treectrl Exp $
+ * RCS: @(#) $Id: tkTreeDisplay.c,v 1.87 2008/10/08 19:22:11 treectrl Exp $
*/
#include "tkTreeCtrl.h"
@@ -997,7 +997,7 @@ Increment_AddX(
TreeDInfo dInfo = tree->dInfo;
int visWidth = Tree_ContentWidth(tree);
- while ((visWidth > 1) &&
+ while ((visWidth > 1) && (dInfo->xScrollIncrementCount > 0) &&
(offset - dInfo->xScrollIncrements[dInfo->xScrollIncrementCount - 1]
> visWidth)) {
size = Increment_AddX(tree,
@@ -1040,7 +1040,7 @@ Increment_AddY(
TreeDInfo dInfo = tree->dInfo;
int visHeight = Tree_ContentHeight(tree);
- while ((visHeight > 1) &&
+ while ((visHeight > 1) && (dInfo->yScrollIncrementCount > 0) &&
(offset - dInfo->yScrollIncrements[dInfo->yScrollIncrementCount - 1]
> visHeight)) {
size = Increment_AddY(tree,