summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogel@noemail.net>2015-04-08 19:32:52 (GMT)
committerfvogel <fvogel@noemail.net>2015-04-08 19:32:52 (GMT)
commite1ae48ff45b55cbc4ae6bea2879ed40ae7cf47ab (patch)
tree47be76c99647e28745efb6257576956214084391
parentc2fcb222a8eeec4de0eca37c0a5be3fae93ef0af (diff)
downloadtk-e1ae48ff45b55cbc4ae6bea2879ed40ae7cf47ab.zip
tk-e1ae48ff45b55cbc4ae6bea2879ed40ae7cf47ab.tar.gz
tk-e1ae48ff45b55cbc4ae6bea2879ed40ae7cf47ab.tar.bz2
Fixed crash with display wordstart - Bug [e4ed00a954]
FossilOrigin-Name: c6263db4688221bc5e66a0af20d29106ef99f21b
-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]