diff options
| author | Jack Jansen <jack.jansen@cwi.nl> | 2004-07-15 14:25:48 (GMT) |
|---|---|---|
| committer | Jack Jansen <jack.jansen@cwi.nl> | 2004-07-15 14:25:48 (GMT) |
| commit | ce17cf6da7544c90acffaa21682b527d1996506d (patch) | |
| tree | 299a028e7afeb9a17edfb46578cbb427703b00c4 | |
| parent | d9e50f554f4ce51681cc399e7ff55cd716898322 (diff) | |
| download | cpython-ce17cf6da7544c90acffaa21682b527d1996506d.zip cpython-ce17cf6da7544c90acffaa21682b527d1996506d.tar.gz cpython-ce17cf6da7544c90acffaa21682b527d1996506d.tar.bz2 | |
The CF inheritance could cause double frees of the underlying objects.
Fixed.
| -rw-r--r-- | Mac/Modules/cf/_CFmodule.c | 10 | ||||
| -rw-r--r-- | Mac/Modules/cf/cfsupport.py | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Mac/Modules/cf/_CFmodule.c b/Mac/Modules/cf/_CFmodule.c index 8543331..04e1624 100644 --- a/Mac/Modules/cf/_CFmodule.c +++ b/Mac/Modules/cf/_CFmodule.c @@ -158,6 +158,7 @@ static void CFTypeRefObj_dealloc(CFTypeRefObject *self) if (self->ob_freeit && self->ob_itself) { self->ob_freeit((CFTypeRef)self->ob_itself); + self->ob_itself = NULL; } self->ob_type->tp_free((PyObject *)self); } @@ -519,6 +520,7 @@ static void CFArrayRefObj_dealloc(CFArrayRefObject *self) if (self->ob_freeit && self->ob_itself) { self->ob_freeit((CFTypeRef)self->ob_itself); + self->ob_itself = NULL; } self->ob_type->tp_base->tp_dealloc((PyObject *)self); } @@ -728,6 +730,7 @@ static void CFMutableArrayRefObj_dealloc(CFMutableArrayRefObject *self) if (self->ob_freeit && self->ob_itself) { self->ob_freeit((CFTypeRef)self->ob_itself); + self->ob_itself = NULL; } self->ob_type->tp_base->tp_dealloc((PyObject *)self); } @@ -966,6 +969,7 @@ static void CFDictionaryRefObj_dealloc(CFDictionaryRefObject *self) if (self->ob_freeit && self->ob_itself) { self->ob_freeit((CFTypeRef)self->ob_itself); + self->ob_itself = NULL; } self->ob_type->tp_base->tp_dealloc((PyObject *)self); } @@ -1157,6 +1161,7 @@ static void CFMutableDictionaryRefObj_dealloc(CFMutableDictionaryRefObject *self if (self->ob_freeit && self->ob_itself) { self->ob_freeit((CFTypeRef)self->ob_itself); + self->ob_itself = NULL; } self->ob_type->tp_base->tp_dealloc((PyObject *)self); } @@ -1338,6 +1343,7 @@ static void CFDataRefObj_dealloc(CFDataRefObject *self) if (self->ob_freeit && self->ob_itself) { self->ob_freeit((CFTypeRef)self->ob_itself); + self->ob_itself = NULL; } self->ob_type->tp_base->tp_dealloc((PyObject *)self); } @@ -1561,6 +1567,7 @@ static void CFMutableDataRefObj_dealloc(CFMutableDataRefObject *self) if (self->ob_freeit && self->ob_itself) { self->ob_freeit((CFTypeRef)self->ob_itself); + self->ob_itself = NULL; } self->ob_type->tp_base->tp_dealloc((PyObject *)self); } @@ -1839,6 +1846,7 @@ static void CFStringRefObj_dealloc(CFStringRefObject *self) if (self->ob_freeit && self->ob_itself) { self->ob_freeit((CFTypeRef)self->ob_itself); + self->ob_itself = NULL; } self->ob_type->tp_base->tp_dealloc((PyObject *)self); } @@ -2564,6 +2572,7 @@ static void CFMutableStringRefObj_dealloc(CFMutableStringRefObject *self) if (self->ob_freeit && self->ob_itself) { self->ob_freeit((CFTypeRef)self->ob_itself); + self->ob_itself = NULL; } self->ob_type->tp_base->tp_dealloc((PyObject *)self); } @@ -2950,6 +2959,7 @@ static void CFURLRefObj_dealloc(CFURLRefObject *self) if (self->ob_freeit && self->ob_itself) { self->ob_freeit((CFTypeRef)self->ob_itself); + self->ob_itself = NULL; } self->ob_type->tp_base->tp_dealloc((PyObject *)self); } diff --git a/Mac/Modules/cf/cfsupport.py b/Mac/Modules/cf/cfsupport.py index f236e6d..95aeaa7 100644 --- a/Mac/Modules/cf/cfsupport.py +++ b/Mac/Modules/cf/cfsupport.py @@ -273,6 +273,7 @@ class MyGlobalObjectDefinition(PEP253Mixin, GlobalObjectDefinition): Output("if (self->ob_freeit && self->ob_itself)") OutLbrace() Output("self->ob_freeit((CFTypeRef)self->ob_itself);") + Output("self->ob_itself = NULL;") OutRbrace() def outputCompare(self): |