summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2015-04-09 12:36:07 (GMT)
committerdgp <dgp@users.sourceforge.net>2015-04-09 12:36:07 (GMT)
commitf834b107eaf34a513bc41be49e0ad054af11cc6a (patch)
tree6352c37d0f3b40235c5d96f791118a16a26f747c
parentd10216afc1dcddd76f93bcdbb6e87bdca8dc7453 (diff)
parent18281d841cc01351755fbbda09b3ec6ce0a39255 (diff)
downloadtk-f834b107eaf34a513bc41be49e0ad054af11cc6a.zip
tk-f834b107eaf34a513bc41be49e0ad054af11cc6a.tar.gz
tk-f834b107eaf34a513bc41be49e0ad054af11cc6a.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 13f3957..b2919d5 100644
--- a/generic/tkTextIndex.c
+++ b/generic/tkTextIndex.c
@@ -2340,7 +2340,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 28dc0df..92cbff0 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]