diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-03 00:50:12 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-03 00:50:12 (GMT) |
| commit | 8f3216a06998e4a20041754ed902367eff1c9cb7 (patch) | |
| tree | ef1fcfd1bff5673c70b1158a430347f0be5aadbc /Modules | |
| parent | 6aa278ee53647ceb63cfe5ce6c1a07b0e10cdf90 (diff) | |
| download | cpython-8f3216a06998e4a20041754ed902367eff1c9cb7.zip cpython-8f3216a06998e4a20041754ed902367eff1c9cb7.tar.gz cpython-8f3216a06998e4a20041754ed902367eff1c9cb7.tar.bz2 | |
Merged revisions 78610 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78610 | victor.stinner | 2010-03-03 01:43:44 +0100 (mer., 03 mars 2010) | 3 lines
Issue #3299: fix thread.allocate_lock() error handler, replace PyObject_Del()
by Py_DECREF() to fix a crash in pydebug mode.
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_threadmodule.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c index aff755e..aab7ab1 100644 --- a/Modules/_threadmodule.c +++ b/Modules/_threadmodule.c @@ -27,14 +27,15 @@ typedef struct { static void lock_dealloc(lockobject *self) { - assert(self->lock_lock); if (self->in_weakreflist != NULL) PyObject_ClearWeakRefs((PyObject *) self); - /* Unlock the lock so it's safe to free it */ - PyThread_acquire_lock(self->lock_lock, 0); - PyThread_release_lock(self->lock_lock); - - PyThread_free_lock(self->lock_lock); + if (self->lock_lock != NULL) { + /* Unlock the lock so it's safe to free it */ + PyThread_acquire_lock(self->lock_lock, 0); + PyThread_release_lock(self->lock_lock); + + PyThread_free_lock(self->lock_lock); + } PyObject_Del(self); } @@ -432,9 +433,9 @@ newlockobject(void) self->lock_lock = PyThread_allocate_lock(); self->in_weakreflist = NULL; if (self->lock_lock == NULL) { - PyObject_Del(self); - self = NULL; + Py_DECREF(self); PyErr_SetString(ThreadError, "can't allocate lock"); + return NULL; } return self; } |