Merged revisions 78610,78635 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. ........ r78635 | victor.stinner | 2010-03-03 22:53:41 +0100 (mer., 03 mars 2010) | 5 lines Issue #3299: fix curses.panel.new_panel() error handler, replace PyObject_DEL() by Py_DECREF() to avoid a crash in pydebug mode. Use po->wo==NULL to detect than the panel is in the lop list or not. ........
This commit is contained in:
parent
0217c958f2
commit
27bf15ef8d
|
@ -178,12 +178,13 @@ PyCursesPanel_New(PANEL *pan, PyCursesWindowObject *wo)
|
||||||
po = PyObject_NEW(PyCursesPanelObject, &PyCursesPanel_Type);
|
po = PyObject_NEW(PyCursesPanelObject, &PyCursesPanel_Type);
|
||||||
if (po == NULL) return NULL;
|
if (po == NULL) return NULL;
|
||||||
po->pan = pan;
|
po->pan = pan;
|
||||||
po->wo = wo;
|
|
||||||
Py_INCREF(wo);
|
|
||||||
if (insert_lop(po) < 0) {
|
if (insert_lop(po) < 0) {
|
||||||
PyObject_DEL(po);
|
po->wo = NULL;
|
||||||
|
Py_DECREF(po);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
po->wo = wo;
|
||||||
|
Py_INCREF(wo);
|
||||||
return (PyObject *)po;
|
return (PyObject *)po;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -191,8 +192,10 @@ static void
|
||||||
PyCursesPanel_Dealloc(PyCursesPanelObject *po)
|
PyCursesPanel_Dealloc(PyCursesPanelObject *po)
|
||||||
{
|
{
|
||||||
(void)del_panel(po->pan);
|
(void)del_panel(po->pan);
|
||||||
Py_DECREF(po->wo);
|
if (po->wo != NULL) {
|
||||||
remove_lop(po);
|
Py_DECREF(po->wo);
|
||||||
|
remove_lop(po);
|
||||||
|
}
|
||||||
PyObject_DEL(po);
|
PyObject_DEL(po);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -148,9 +149,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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue