mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #19437: Fix _threading.RLock constructor (rlock_new), call

Browse source 
Py_DECREF(self) if PyThread_allocate_lock() failed instead of calling directly
type->tp_free(self), to keep the chained list of objects consistent when Python
is compiled in debug mode

fails, don't consume the row (restore it) and fail immediatly (don't call
pysqlite_step())
This commit is contained in:
Victor Stinner 2013-11-05 15:10:19 +01:00
parent 85a12a8beb
commit 357f5155dc
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Modules/_threadmodule.c
View file

@ -255,14 +255,17 @@ typedef struct {
static void static void
rlock_dealloc(rlockobject *self) rlock_dealloc(rlockobject *self)
{ {
assert(self->rlock_lock);
if (self->in_weakreflist != NULL) if (self->in_weakreflist != NULL)
PyObject_ClearWeakRefs((PyObject *) self); PyObject_ClearWeakRefs((PyObject *) self);
/* self->rlock_lock can be NULL if PyThread_allocate_lock() failed
in rlock_new() */
if (self->rlock_lock != NULL) {
/* Unlock the lock so it's safe to free it */ /* Unlock the lock so it's safe to free it */
if (self->rlock_count > 0) if (self->rlock_count > 0)
PyThread_release_lock(self->rlock_lock); PyThread_release_lock(self->rlock_lock);
PyThread_free_lock(self->rlock_lock); PyThread_free_lock(self->rlock_lock);
}
Py_TYPE(self)->tp_free(self); Py_TYPE(self)->tp_free(self);
} }
@ -452,15 +455,16 @@ rlock_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
self = (rlockobject *) type->tp_alloc(type, 0); self = (rlockobject *) type->tp_alloc(type, 0);
if (self != NULL) { if (self != NULL) {
self->rlock_lock = PyThread_allocate_lock();
if (self->rlock_lock == NULL) {
type->tp_free(self);
PyErr_SetString(ThreadError, "can't allocate lock");
return NULL;
}
self->in_weakreflist = NULL; self->in_weakreflist = NULL;
self->rlock_owner = 0; self->rlock_owner = 0;
self->rlock_count = 0; self->rlock_count = 0;
self->rlock_lock = PyThread_allocate_lock();
if (self->rlock_lock == NULL) {
Py_DECREF(self);
PyErr_SetString(ThreadError, "can't allocate lock");
return NULL;
}
} }
return (PyObject *) self; return (PyObject *) self;