diff options
| -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 744e94d..5181d07 100644 --- a/Modules/_threadmodule.c +++ b/Modules/_threadmodule.c @@ -25,12 +25,13 @@ typedef struct { static void lock_dealloc(lockobject *self) { - assert(self->lock_lock); - /* 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); } @@ -160,9 +161,9 @@ newlockobject(void) return NULL; self->lock_lock = PyThread_allocate_lock(); if (self->lock_lock == NULL) { - PyObject_Del(self); - self = NULL; + Py_DECREF(self); PyErr_SetString(ThreadError, "can't allocate lock"); + return NULL; } return self; } |