summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2015-04-09 12:39:39 (GMT)
committerdgp <dgp@users.sourceforge.net>2015-04-09 12:39:39 (GMT)
commit3f7de958795b3d01851e611f2aaca65e3ab9e196 (patch)
tree24e00ba54c7b8964f630041fe61d4dfc01937344
parenta5834870c9b90076e5c2c5d249f51d44d6c4b0c1 (diff)
parentf834b107eaf34a513bc41be49e0ad054af11cc6a (diff)
downloadtk-3f7de958795b3d01851e611f2aaca65e3ab9e196.zip
tk-3f7de958795b3d01851e611f2aaca65e3ab9e196.tar.gz
tk-3f7de958795b3d01851e611f2aaca65e3ab9e196.tar.bz2
[e4ed00a954] Fixed crash with display wordstart
-rw-r--r--generic/tkTextIndex.c2
-rw-r--r--tests/textIndex.test5
2 files changed, 6 insertions, 1 deletions
diff --git a/generic/tkTextIndex.c b/generic/tkTextIndex.c
index 70f74fb..418b934 100644
--- a/generic/tkTextIndex.c
+++ b/generic/tkTextIndex.c
@@ -2327,7 +2327,7 @@ StartEnd(
int offset;
if (modifier == TKINDEX_DISPLAY) {
- TkTextIndexForwChars(NULL, indexPtr, 0, indexPtr,
+ TkTextIndexForwChars(textPtr, indexPtr, 0, indexPtr,
COUNT_DISPLAY_INDICES);
}
diff --git a/tests/textIndex.test b/tests/textIndex.test
index c949b1f..dead9c1 100644
--- a/tests/textIndex.test
+++ b/tests/textIndex.test
@@ -905,6 +905,11 @@ test textIndex-22.12 {text index wordstart, unicode} {
test textIndex-22.13 {text index wordstart, unicode} {
text_test_word wordstart "\uc700\uc700 abc" 8
} 3
+test textIndex-22.15 {text index display wordstart} {
+ catch {destroy .t}
+ text .t
+ .t index "1.0 display wordstart" ; # used to crash
+} 1.0
test textIndex-23.1 {text paragraph start} {
pack [text .t2]