summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo J. A. M. Carneiro <gjc@src.gnome.org>2008-08-30 19:04:42 +0000
committerGustavo J. A. M. Carneiro <gjc@src.gnome.org>2008-08-30 19:04:42 +0000
commit311d81617ad7ea8e046d76adcef509cd5856744f (patch)
treede8ea5d4d5921323c728d748e83d82c4704c5751
parent702b6a8fbfe59578749e930b7b2235ad6d479530 (diff)
downloadpygobject-311d81617ad7ea8e046d76adcef509cd5856744f.tar.gz
pygobject-311d81617ad7ea8e046d76adcef509cd5856744f.tar.xz
pygobject-311d81617ad7ea8e046d76adcef509cd5856744f.zip
* gobject/pygobject.c: Fix memory problems reported by valgrind due to
* glib/pyglib.h: * gobject/pygobject.c: Fix memory problems reported by valgrind due to invalid tp_basicsize in PyGPropsDescr_Type. Closes #549945. svn path=/trunk/; revision=956
-rw-r--r--ChangeLog6
-rw-r--r--glib/pyglib.h3
-rw-r--r--gobject/pygobject.c3
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d2e89b8..b4bc69c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-30 Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
+
+ * glib/pyglib.h: * gobject/pygobject.c: Fix memory problems
+ reported by valgrind due to invalid tp_basicsize in
+ PyGPropsDescr_Type. Closes #549945.
+
2008-08-28 Paul Pogonyshev <pogonyshev@gmx.net>
Bug 549191 – Constructor of gtk.TreeView raises TypeError when
diff --git a/glib/pyglib.h b/glib/pyglib.h
index 85b7575..5715a2f 100644
--- a/glib/pyglib.h
+++ b/glib/pyglib.h
@@ -76,7 +76,8 @@ PyTypeObject symbol = { \
PyObject_HEAD_INIT(NULL) \
0, \
typename, \
- sizeof(csymbol) \
+ sizeof(csymbol), \
+ 0, \
};
#define PYGLIB_REGISTER_TYPE(d, type, name) \
if (!type.tp_alloc) \
diff --git a/gobject/pygobject.c b/gobject/pygobject.c
index 15ddc47..242833e 100644
--- a/gobject/pygobject.c
+++ b/gobject/pygobject.c
@@ -419,7 +419,8 @@ static PySequenceMethods _PyGProps_as_sequence = {
0
};
-PYGLIB_DEFINE_TYPE("gobject.GPropsDescr", PyGPropsDescr_Type, 0);
+struct empty {} _empty;
+PYGLIB_DEFINE_TYPE("gobject.GPropsDescr", PyGPropsDescr_Type, _empty);
static PyObject *
pyg_props_descr_descr_get(PyObject *self, PyObject *obj, PyObject *type)