[6286e04179] Backport [5f8258ad2a] to stop `make test` segfaults.

1 files changed, 11 insertions, 2 deletions

diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index f718e2a..8cd5a9a 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -3938,8 +3938,17 @@ RedisplayText(
 {
     register TkText *textPtr = (TkText *) clientData;
     TextDInfo *dInfoPtr = textPtr->dInfoPtr;
-    TkRegion damageRegion = TkCreateRegion();
-    XRectangle rectangle = {0, 0, dInfoPtr->maxX, dInfoPtr->maxY};
+    TkRegion damageRegion;
+    XRectangle rectangle;
+
+    if (dInfoPtr == NULL) {
+	return;
+    }
+    damageRegion = TkCreateRegion();
+    rectangle.x = 0;
+    rectangle.y = 0;
+    rectangle.width = dInfoPtr->maxX;
+    rectangle.height = dInfoPtr->maxY;
     TkUnionRectWithRegion(&rectangle, damageRegion, damageRegion);
     
     TextInvalidateRegion(textPtr, damageRegion);