From 97b77b3951bc72a15481a82fca2fd3ee9dd3d1d8 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 20 May 2013 20:38:47 +0000 Subject: [PATCH] * python/py-value.c (valpy_get_dynamic_type): Simplify dynamic_type assignment. Use Py_XINCREF. --- gdb/ChangeLog | 5 +++++ gdb/python/py-value.c | 11 ++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fde010c..99fc791 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2013-05-20 Tom Tromey + * python/py-value.c (valpy_get_dynamic_type): Simplify + dynamic_type assignment. Use Py_XINCREF. + +2013-05-20 Tom Tromey + * python/py-type.c (typy_fields): Unconditionally decref 'r'. 2013-05-20 Tom Tromey diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c index 9c55fe1..0b2a38f 100644 --- a/gdb/python/py-value.c +++ b/gdb/python/py-value.c @@ -334,18 +334,11 @@ valpy_get_dynamic_type (PyObject *self, void *closure) GDB_PY_HANDLE_EXCEPTION (except); if (type == NULL) - { - /* Ensure that the TYPE field is ready. */ - if (!valpy_get_type (self, NULL)) - return NULL; - /* We don't need to incref here, because valpy_get_type already - did it for us. */ - obj->dynamic_type = obj->type; - } + obj->dynamic_type = valpy_get_type (self, NULL); else obj->dynamic_type = type_to_type_object (type); - Py_INCREF (obj->dynamic_type); + Py_XINCREF (obj->dynamic_type); return obj->dynamic_type; } -- 2.7.4