blob: 3250bffa568c56b9433e5bd1ffa9b247081d719d (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
--- ../generic/tclEncoding.c.orig Thu Apr 5 13:28:52 2001
+++ ../generic/tclEncoding.c Thu Apr 10 00:49:34 2003
@@ -310,19 +310,19 @@
{
Tcl_HashSearch search;
Tcl_HashEntry *hPtr;
- Encoding *encodingPtr;
Tcl_MutexLock(&encodingMutex);
encodingsInitialized = 0;
hPtr = Tcl_FirstHashEntry(&encodingTable, &search);
while (hPtr != NULL) {
- encodingPtr = (Encoding *) Tcl_GetHashValue(hPtr);
- if (encodingPtr->freeProc != NULL) {
- (*encodingPtr->freeProc)(encodingPtr->clientData);
- }
- ckfree((char *) encodingPtr->name);
- ckfree((char *) encodingPtr);
- hPtr = Tcl_NextHashEntry(&search);
+ /*
+ * Call FreeEncoding instead of doing it directly to handle refcounts
+ * like escape encodings use. [Bug #524674]
+ * Make sure to call Tcl_FirstHashEntry repeatedly so that all
+ * encodings are eventually cleaned up.
+ */
+ FreeEncoding((Tcl_Encoding) Tcl_GetHashValue(hPtr));
+ hPtr = Tcl_FirstHashEntry(&encodingTable, &search);
}
Tcl_DeleteHashTable(&encodingTable);
Tcl_MutexUnlock(&encodingMutex);
|
