From f79e22d2b2953a58f9a5bfb6550c6cd938ad5c29 Mon Sep 17 00:00:00 2001
From: "fvogelnew1@free.fr" <fvogel>
Date: Wed, 8 Apr 2015 19:32:52 +0000
Subject: Fixed crash with display wordstart - Bug [e4ed00a954]

---
 generic/tkTextIndex.c | 2 +-
 tests/textIndex.test  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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]
-- 
cgit v0.12