Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix reference counting for "option" objects, when being duplicated. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | bug-069c9e43c4 |
| Files: | files | file ages | folders |
| SHA1: |
bc21cf9277c0d644dc019a80dffa85e2 |
| User & Date: | jan.nijtmans 2013-08-14 10:53:39 |
Context
|
2013-08-14
| ||
| 13:16 | Bug [069c9e43c4]: FreeOptionInternalRep() breaks Tk_CreateOptionTable() check-in: aaf11bdc user: jan.nijtmans tags: trunk | |
| 10:53 | Fix reference counting for "option" objects, when being duplicated. Closed-Leaf check-in: bc21cf92 user: jan.nijtmans tags: bug-069c9e43c4 | |
|
2013-08-11
| ||
| 14:55 | rebase check-in: aa61bf42 user: jan.nijtmans tags: bug-069c9e43c4 | |
Changes
Changes to generic/tkConfig.c.
| ︙ | ︙ | |||
125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 |
static Tcl_Obj * GetObjectForOption(char *recordPtr,
Option *optionPtr, Tk_Window tkwin);
static Option * GetOption(const char *name, OptionTable *tablePtr);
static Option * GetOptionFromObj(Tcl_Interp *interp,
Tcl_Obj *objPtr, OptionTable *tablePtr);
static int ObjectIsEmpty(Tcl_Obj *objPtr);
static void FreeOptionInternalRep(Tcl_Obj *objPtr);
/*
* The structure below defines an object type that is used to cache the result
* of looking up an option name. If an object has this type, then its
* internalPtr1 field points to the OptionTable in which it was looked up, and
* the internalPtr2 field points to the entry that matched.
*/
static const Tcl_ObjType optionObjType = {
"option", /* name */
FreeOptionInternalRep, /* freeIntRepProc */
| > | | 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 |
static Tcl_Obj * GetObjectForOption(char *recordPtr,
Option *optionPtr, Tk_Window tkwin);
static Option * GetOption(const char *name, OptionTable *tablePtr);
static Option * GetOptionFromObj(Tcl_Interp *interp,
Tcl_Obj *objPtr, OptionTable *tablePtr);
static int ObjectIsEmpty(Tcl_Obj *objPtr);
static void FreeOptionInternalRep(Tcl_Obj *objPtr);
static void DupOptionInternalRep(Tcl_Obj *, Tcl_Obj *);
/*
* The structure below defines an object type that is used to cache the result
* of looking up an option name. If an object has this type, then its
* internalPtr1 field points to the OptionTable in which it was looked up, and
* the internalPtr2 field points to the entry that matched.
*/
static const Tcl_ObjType optionObjType = {
"option", /* name */
FreeOptionInternalRep, /* freeIntRepProc */
DupOptionInternalRep, /* dupIntRepProc */
NULL, /* updateStringProc */
NULL /* setFromAnyProc */
};
/*
*--------------------------------------------------------------
*
|
| ︙ | ︙ | |||
1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 |
register Tk_OptionTable tablePtr = (Tk_OptionTable) objPtr->internalRep.twoPtrValue.ptr1;
Tk_DeleteOptionTable(tablePtr);
objPtr->typePtr = NULL;
objPtr->internalRep.twoPtrValue.ptr1 = NULL;
objPtr->internalRep.twoPtrValue.ptr2 = NULL;
}
/*
*--------------------------------------------------------------
*
* Tk_SetOptions --
*
* Process one or more name-value pairs for configuration options and
| > > > > > > > > > > > > > > > > > > > > > > | 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 |
register Tk_OptionTable tablePtr = (Tk_OptionTable) objPtr->internalRep.twoPtrValue.ptr1;
Tk_DeleteOptionTable(tablePtr);
objPtr->typePtr = NULL;
objPtr->internalRep.twoPtrValue.ptr1 = NULL;
objPtr->internalRep.twoPtrValue.ptr2 = NULL;
}
/*
*---------------------------------------------------------------------------
*
* DupOptionInternalRep --
*
* When a cached style object is duplicated, this is called to update the
* internal reps.
*
*---------------------------------------------------------------------------
*/
static void
DupOptionInternalRep(
Tcl_Obj *srcObjPtr, /* The object we are copying from. */
Tcl_Obj *dupObjPtr) /* The object we are copying to. */
{
register OptionTable *tablePtr = (OptionTable *) srcObjPtr->internalRep.twoPtrValue.ptr1;
tablePtr->refCount++;
dupObjPtr->typePtr = srcObjPtr->typePtr;
dupObjPtr->internalRep = srcObjPtr->internalRep;
}
/*
*--------------------------------------------------------------
*
* Tk_SetOptions --
*
* Process one or more name-value pairs for configuration options and
|
| ︙ | ︙ |