15266e
diff -up Tk-804.028/pTk/mTk/generic/tkConfig.c.seg Tk-804.028/pTk/mTk/generic/tkConfig.c
15266e
--- Tk-804.028/pTk/mTk/generic/tkConfig.c.seg	2008-03-11 23:29:39.000000000 -0400
15266e
+++ Tk-804.028/pTk/mTk/generic/tkConfig.c	2008-03-11 23:28:09.000000000 -0400
15266e
@@ -1210,11 +1210,11 @@ GetOptionFromObj(interp, objPtr, tablePt
15266e
      * First, check to see if the object already has the answer cached.
15266e
      */
15266e
 
15266e
-    if (objPtr->typePtr == &tkOptionObjType) {
15266e
+/*    if (objPtr->typePtr == &tkOptionObjType) {
15266e
         if (objPtr->internalRep.twoPtrValue.ptr1 == (VOID *) tablePtr) {
15266e
             return (Option *) objPtr->internalRep.twoPtrValue.ptr2;
15266e
         }
15266e
-    }
15266e
+    }*/
15266e
 
15266e
     /*
15266e
      * The answer isn't cached.
15266e
@@ -2277,9 +2277,15 @@ Tk_GetOptionValue(interp, recordPtr, opt
15266e
     if (optionPtr == NULL) {
15266e
 	return NULL;
15266e
     }
15266e
+
15266e
+    if (optionPtr->specPtr == NULL) {
15266e
+	return NULL;
15266e
+    }
15266e
+
15266e
     if (optionPtr->specPtr->type == TK_OPTION_SYNONYM) {
15266e
 	optionPtr = optionPtr->extra.synonymPtr;
15266e
     }
15266e
+
15266e
     if (optionPtr->specPtr->objOffset >= 0) {
15266e
 	resultPtr = *((Tcl_Obj **) (recordPtr + optionPtr->specPtr->objOffset));
15266e
 	if (resultPtr == NULL) {