]>
Commit | Line | Data |
---|---|---|
f9cf2899 MT |
1 | diff -up Tk-804.028/pTk/mTk/generic/tkConfig.c.seg Tk-804.028/pTk/mTk/generic/tkConfig.c |
2 | --- Tk-804.028/pTk/mTk/generic/tkConfig.c.seg 2008-03-11 23:29:39.000000000 -0400 | |
3 | +++ Tk-804.028/pTk/mTk/generic/tkConfig.c 2008-03-11 23:28:09.000000000 -0400 | |
4 | @@ -1210,11 +1210,11 @@ GetOptionFromObj(interp, objPtr, tablePt | |
5 | * First, check to see if the object already has the answer cached. | |
6 | */ | |
7 | ||
8 | - if (objPtr->typePtr == &tkOptionObjType) { | |
9 | +/* if (objPtr->typePtr == &tkOptionObjType) { | |
10 | if (objPtr->internalRep.twoPtrValue.ptr1 == (VOID *) tablePtr) { | |
11 | return (Option *) objPtr->internalRep.twoPtrValue.ptr2; | |
12 | } | |
13 | - } | |
14 | + }*/ | |
15 | ||
16 | /* | |
17 | * The answer isn't cached. | |
18 | @@ -2277,9 +2277,15 @@ Tk_GetOptionValue(interp, recordPtr, opt | |
19 | if (optionPtr == NULL) { | |
20 | return NULL; | |
21 | } | |
22 | + | |
23 | + if (optionPtr->specPtr == NULL) { | |
24 | + return NULL; | |
25 | + } | |
26 | + | |
27 | if (optionPtr->specPtr->type == TK_OPTION_SYNONYM) { | |
28 | optionPtr = optionPtr->extra.synonymPtr; | |
29 | } | |
30 | + | |
31 | if (optionPtr->specPtr->objOffset >= 0) { | |
32 | resultPtr = *((Tcl_Obj **) (recordPtr + optionPtr->specPtr->objOffset)); | |
33 | if (resultPtr == NULL) { |