mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-03 15:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 78611 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78611 | victor.stinner | 2010-03-03 01:50:12 +0100 (mer., 03 mars 2010) | 10 lines

  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:51:28 +00:00
parent 151205f24f
commit 5774043795
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Modules/_threadmodule.c
View file

@ -25,12 +25,13 @@ typedef struct {
static void static void
lock_dealloc(lockobject *self) lock_dealloc(lockobject *self)
{ {
assert(self->lock_lock); if (self->lock_lock != NULL) {
/* Unlock the lock so it's safe to free it */ /* Unlock the lock so it's safe to free it */
PyThread_acquire_lock(self->lock_lock, 0); PyThread_acquire_lock(self->lock_lock, 0);
PyThread_release_lock(self->lock_lock); PyThread_release_lock(self->lock_lock);
PyThread_free_lock(self->lock_lock); PyThread_free_lock(self->lock_lock);
}
PyObject_Del(self); PyObject_Del(self);
} }
@ -160,9 +161,9 @@ newlockobject(void)
return NULL; return NULL;
self->lock_lock = PyThread_allocate_lock(); self->lock_lock = PyThread_allocate_lock();
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;
} }