diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-07-27 00:20:25 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-07-27 00:20:25 +0400 |
| commit | 52f639277b527b97eb29f3f91e0f5899fd30d8a2 (patch) | |
| tree | 3d60453c68f4cfa896d67a900a2d825455a093e9 /source/blender/freestyle/intern/python/BPy_Iterator.cpp | |
| parent | 69853d3e409470aebda5732daf3e525231d317e6 (diff) | |
Second attempt to fix a null pointer reference in deallocators of
built-in types (the first was in revision 21877). When an exception
has raised within from the __init__ method of a user-defined class
derived from a built-in type (e.g., UnaryPredicate0D and
BinaryPredicate1D), some member variables of the base type are
left uninitialized, leading to a null pointer reference in the
"__dealloc__" function in the base type. To avoid this, pointer
checking was added in the deallocators of those built-in types that
can be used to define a subclass by a user.
Diffstat (limited to 'source/blender/freestyle/intern/python/BPy_Iterator.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/python/BPy_Iterator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp index 5c19dfd29ac..3356325c92f 100644 --- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp +++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp @@ -193,7 +193,8 @@ PyMODINIT_FUNC Iterator_Init( PyObject *module ) void Iterator___dealloc__(BPy_Iterator* self) { - delete self->it; + if (self->it) + delete self->it; self->ob_type->tp_free((PyObject*)self); } |