From 7e3535dff93c2665d3f6f513bb5e68c5125aa717 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Fri, 12 Oct 2007 03:06:08 +0000
Subject: 	* generic/tkTextDisp.c (CharUndisplayProc): fix textDisp.test
 crash.

---
 generic/tkTextDisp.c | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 7e43bf1..4bfdd65 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkTextDisp.c,v 1.66 2007/09/20 22:59:40 dkf Exp $
+ * RCS: @(#) $Id: tkTextDisp.c,v 1.67 2007/10/12 03:06:08 das Exp $
  */
 
 #include "tkInt.h"
@@ -7515,32 +7515,34 @@ CharUndisplayProc(
 {
     CharInfo *ciPtr = (CharInfo *) chunkPtr->clientData;
 
+    if (ciPtr) {
 #if TK_LAYOUT_WITH_BASE_CHUNKS
-    if (chunkPtr == ciPtr->baseChunkPtr) {
-	/*
-	 * Basechunks are undisplayed first, when DLines are freed or
-	 * partially freed, so this makes sure we don't access their data any
-	 * more.
-	 */
+	if (chunkPtr == ciPtr->baseChunkPtr) {
+	    /*
+	     * Basechunks are undisplayed first, when DLines are freed or
+	     * partially freed, so this makes sure we don't access their data
+	     * any more.
+	     */
 
-	FreeBaseChunk(chunkPtr);
-    } else if (ciPtr->baseChunkPtr != NULL) {
-	/*
-	 * When other char chunks are undisplayed, drop their characters from
-	 * the base chunk. This usually happens, when they are last in a line
-	 * and need to be re-layed out.
-	 */
+	    FreeBaseChunk(chunkPtr);
+	} else if (ciPtr->baseChunkPtr != NULL) {
+	    /*
+	     * When other char chunks are undisplayed, drop their characters
+	     * from the base chunk. This usually happens, when they are last
+	     * in a line and need to be re-layed out.
+	     */
 
-	RemoveFromBaseChunk(chunkPtr);
-    }
+	    RemoveFromBaseChunk(chunkPtr);
+	}
 
-    ciPtr->baseChunkPtr = NULL;
-    ciPtr->chars = NULL;
-    ciPtr->numBytes = 0;
+	ciPtr->baseChunkPtr = NULL;
+	ciPtr->chars = NULL;
+	ciPtr->numBytes = 0;
 #endif /* TK_LAYOUT_WITH_BASE_CHUNKS */
 
-    ckfree((char *) ciPtr);
-    chunkPtr->clientData = NULL;
+	ckfree((char *) ciPtr);
+	chunkPtr->clientData = NULL;
+    }
 }
 
 /*
-- 
cgit v0.12