git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix garbage collection (Modules/gcmodule.c:380: move_unreachable: Assertion
[enigma2.git]
/
lib
/
base
/
ebase.cpp
diff --git
a/lib/base/ebase.cpp
b/lib/base/ebase.cpp
index 62746f4be4ea144618b9ccc1054ea53015e9d103..bcfab61c0fb42a0eb51344e710a0131650de3f18 100644
(file)
--- a/
lib/base/ebase.cpp
+++ b/
lib/base/ebase.cpp
@@
-368,16
+368,19
@@
struct eTimerPy
static int
eTimerPy_traverse(eTimerPy *self, visitproc visit, void *arg)
{
static int
eTimerPy_traverse(eTimerPy *self, visitproc visit, void *arg)
{
- PyObject *obj = self->tm->timeout.get();
- Py_VISIT(obj);
+ PyObject *obj = self->tm->timeout.get(true);
+ if (obj) {
+ Py_VISIT(obj);
+ }
return 0;
}
static int
eTimerPy_clear(eTimerPy *self)
{
return 0;
}
static int
eTimerPy_clear(eTimerPy *self)
{
- PyObject *obj = self->tm->timeout.get();
- Py_CLEAR(obj);
+ PyObject *obj = self->tm->timeout.get(true);
+ if (obj)
+ Py_CLEAR(obj);
return 0;
}
return 0;
}
@@
-572,16
+575,18
@@
struct eSocketNotifierPy
static int
eSocketNotifierPy_traverse(eSocketNotifierPy *self, visitproc visit, void *arg)
{
static int
eSocketNotifierPy_traverse(eSocketNotifierPy *self, visitproc visit, void *arg)
{
- PyObject *obj = self->sn->activated.get();
- Py_VISIT(obj);
+ PyObject *obj = self->sn->activated.get(true);
+ if (obj)
+ Py_VISIT(obj);
return 0;
}
static int
eSocketNotifierPy_clear(eSocketNotifierPy *self)
{
return 0;
}
static int
eSocketNotifierPy_clear(eSocketNotifierPy *self)
{
- PyObject *obj = self->sn->activated.get();
- Py_CLEAR(obj);
+ PyObject *obj = self->sn->activated.get(true);
+ if (obj)
+ Py_CLEAR(obj);
return 0;
}
return 0;
}