Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
........
This commit is contained in:
Victor Stinner 2010-03-03 00:50:12 +00:00
parent 6aa278ee53
commit 8f3216a069
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Modules/_threadmodule.c
View File

@ -27,14 +27,15 @@ typedef struct {
static void static void
lock_dealloc(lockobject *self) lock_dealloc(lockobject *self)
{ {
assert(self->lock_lock);
if (self->in_weakreflist != NULL) if (self->in_weakreflist != NULL)
PyObject_ClearWeakRefs((PyObject *) self); PyObject_ClearWeakRefs((PyObject *) self);
/* Unlock the lock so it's safe to free it */ if (self->lock_lock != NULL) {
PyThread_acquire_lock(self->lock_lock, 0); /* Unlock the lock so it's safe to free it */
PyThread_release_lock(self->lock_lock); PyThread_acquire_lock(self->lock_lock, 0);
PyThread_release_lock(self->lock_lock);
PyThread_free_lock(self->lock_lock);
PyThread_free_lock(self->lock_lock);
}
PyObject_Del(self); PyObject_Del(self);
} }
@ -432,9 +433,9 @@ newlockobject(void)
self->lock_lock = PyThread_allocate_lock(); self->lock_lock = PyThread_allocate_lock();
self->in_weakreflist = NULL; self->in_weakreflist = NULL;
if (self->lock_lock == NULL) { if (self->lock_lock == NULL) {
PyObject_Del(self); Py_DECREF(self);
self = NULL;
PyErr_SetString(ThreadError, "can't allocate lock"); PyErr_SetString(ThreadError, "can't allocate lock");
return NULL;
} }
return self; return self;
} }