From 641b317cbd760a8d3676fff03a903c8c294410d0 Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Fri, 1 Aug 2014 01:00:11 +0000
Subject: Fix for font configure crash on OS X, thanks to rob@bitkeeper.com for
 the patch

---
 generic/tkFont.c      | 66 +++++++++++++++++++++++++--------------------------
 macosx/tkMacOSXFont.c |  2 +-
 macosx/tkMacOSXMenu.c |  3 +++
 3 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/generic/tkFont.c b/generic/tkFont.c
index cbc4cf4..a955c35 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -600,40 +600,40 @@ Tk_FontObjCmd(
 	return result;
     }
     case FONT_CONFIGURE: {
-	int result;
-	const char *string;
-	Tcl_Obj *objPtr;
-	NamedFont *nfPtr;
-	Tcl_HashEntry *namedHashPtr;
-
-	if (objc < 3) {
-	    Tcl_WrongNumArgs(interp, 2, objv, "fontname ?-option value ...?");
-	    return TCL_ERROR;
-	}
-	string = Tcl_GetString(objv[2]);
-	namedHashPtr = Tcl_FindHashEntry(&fiPtr->namedTable, string);
+    	int result;
+    	const char *string;
+    	Tcl_Obj *objPtr;
+    	NamedFont *nfPtr;
+    	Tcl_HashEntry *namedHashPtr;
+
+    	if (objc < 3) {
+    	    Tcl_WrongNumArgs(interp, 2, objv, "fontname ?-option value ...?");
+    	    return TCL_ERROR;
+    	}
+    	string = Tcl_GetString(objv[2]);
+    	namedHashPtr = Tcl_FindHashEntry(&fiPtr->namedTable, string);
 	nfPtr = NULL;		/* lint. */
-	if (namedHashPtr != NULL) {
-	    nfPtr = Tcl_GetHashValue(namedHashPtr);
-	}
-	if ((namedHashPtr == NULL) || nfPtr->deletePending) {
-	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "named font \"%s\" doesn't exist", string));
-	    Tcl_SetErrorCode(interp, "TK", "LOOKUP", "FONT", string, NULL);
-	    return TCL_ERROR;
-	}
-	if (objc == 3) {
-	    objPtr = NULL;
-	} else if (objc == 4) {
-	    objPtr = objv[3];
-	} else {
-	    result = ConfigAttributesObj(interp, tkwin, objc - 3, objv + 3,
-		    &nfPtr->fa);
-	    UpdateDependentFonts(fiPtr, tkwin, namedHashPtr);
-	    return result;
-	}
-	return GetAttributeInfoObj(interp, &nfPtr->fa, objPtr);
-    }
+    	if (namedHashPtr != NULL) {
+    	    nfPtr = Tcl_GetHashValue(namedHashPtr);
+    	}
+    	if ((namedHashPtr == NULL) || nfPtr->deletePending) {
+    	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+    		    "named font \"%s\" doesn't exist", string));
+    	    Tcl_SetErrorCode(interp, "TK", "LOOKUP", "FONT", string, NULL);
+    	    return TCL_ERROR;
+    	}
+    	if (objc == 3) {
+    	    objPtr = NULL;
+    	} else if (objc == 4) {
+    	    objPtr = objv[3];
+    	} else {
+    	    result = ConfigAttributesObj(interp, tkwin, objc - 3, objv + 3,
+    		    &nfPtr->fa);
+    	    UpdateDependentFonts(fiPtr, tkwin, namedHashPtr);
+    	    return result;
+    	}
+    	return GetAttributeInfoObj(interp, &nfPtr->fa, objPtr);
+     } 
     case FONT_CREATE: {
 	int skip = 3, i;
 	const char *name;
diff --git a/macosx/tkMacOSXFont.c b/macosx/tkMacOSXFont.c
index d800ae5..4c8ac30 100644
--- a/macosx/tkMacOSXFont.c
+++ b/macosx/tkMacOSXFont.c
@@ -293,7 +293,7 @@ InitFont(
 	    [NSNumber numberWithInt:fmPtr->fixed ? 0 : 1],
 		NSLigatureAttributeName,
 	    [NSNumber numberWithDouble:kern], NSKernAttributeName, nil];
-    fontPtr->nsAttributes = TkMacOSXMakeUncollectableAndRetain(nsAttributes);
+            fontPtr->nsAttributes = TkMacOSXMakeUncollectableAndRetain(nsAttributes);
     #undef nCh
 }
 
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 83ad47a..313a5cf 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -684,6 +684,9 @@ TkpConfigureMenuEntry(
 		  NSArray *itemArray = [submenu itemArray];
 		  for (NSMenuItem *item in itemArray) {
 		    TkMenuEntry *submePtr = menuRefPtr->menuPtr->entries[i];
+		    /* Work around an apparent bug where itemArray can have
+                      more items than the menu's entries[] array. */
+                    if (i >= menuRefPtr->menuPtr->numEntries) break;
 		    [item setEnabled: !(submePtr->state == ENTRY_DISABLED)];
 		    i++;
 		  }
-- 
cgit v0.12