+2012-08-15 Tom Tromey <tromey@redhat.com>
+
+ PR python/14387:
+ * python/py-bpevent.c (create_breakpoint_event_object): Update
+ comment.
+ * python/py-event.c (evpy_add_attribute): Update comment.
+ * python/py-exitedevent.c (create_exited_event_object): Fix
+ reference counting and error handling.
+ * python/py-newobjfileevent.c (create_new_objfile_event_object):
+ Fix reference counting.
+ * python/py-signalevent.c (create_signal_event_object): Fix
+ reference counting and error handling.
+ * python/py-stopevent.c (emit_stop_event): Fix reference
+ counting.
+ * python/py-threadevent.c (get_event_thread): Return a
+ borrowed reference.
+ * python/py-type.c (convert_field): Fix reference counting.
+
2012-08-15 Tom Tromey <tromey@redhat.com>
* dwarf2read.c (dwarf_decode_macro_bytes)
static PyTypeObject breakpoint_event_object_type;
-/* Create and initialize a BreakpointEvent object. */
+/* Create and initialize a BreakpointEvent object. This acquires new
+ references to BREAKPOINT_LIST and FIRST_BP. */
PyObject *
create_breakpoint_event_object (PyObject *breakpoint_list, PyObject *first_bp)
/* Add the attribute ATTR to the event object EVENT. In
python this attribute will be accessible by the name NAME.
- returns 0 if the operation succeeds and -1 otherwise. */
+ returns 0 if the operation succeeds and -1 otherwise. This
+ function acquires a new reference to ATTR. */
int
evpy_add_attribute (PyObject *event, char *name, PyObject *attr)
create_exited_event_object (const LONGEST *exit_code, struct inferior *inf)
{
PyObject *exited_event;
- PyObject *inf_obj;
+ PyObject *inf_obj = NULL;
exited_event = create_event_object (&exited_event_object_type);
if (!exited_event)
goto fail;
- if (exit_code
- && evpy_add_attribute (exited_event,
- "exit_code",
- PyLong_FromLongLong (*exit_code)) < 0)
- goto fail;
+ if (exit_code)
+ {
+ PyObject *exit_code_obj = PyLong_FromLongLong (*exit_code);
+ int failed;
+
+ if (exit_code_obj == NULL)
+ goto fail;
+
+ failed = evpy_add_attribute (exited_event, "exit_code",
+ exit_code_obj) < 0;
+ Py_DECREF (exit_code_obj);
+ if (failed)
+ goto fail;
+ }
inf_obj = inferior_to_inferior_object (inf);
if (!inf_obj || evpy_add_attribute (exited_event,
"inferior",
inf_obj) < 0)
goto fail;
+ Py_DECREF (inf_obj);
return exited_event;
- fail:
- Py_XDECREF (exited_event);
- return NULL;
+ fail:
+ Py_XDECREF (inf_obj);
+ Py_XDECREF (exited_event);
+ return NULL;
}
/* Callback that is used when an exit event occurs. This function
create_new_objfile_event_object (struct objfile *objfile)
{
PyObject *objfile_event;
- PyObject *py_objfile;
+ PyObject *py_objfile = NULL;
objfile_event = create_event_object (&new_objfile_event_object_type);
if (!objfile_event)
"new_objfile",
py_objfile) < 0)
goto fail;
+ Py_DECREF (py_objfile);
return objfile_event;
fail:
+ Py_XDECREF (py_objfile);
Py_XDECREF (objfile_event);
return NULL;
}
create_signal_event_object (enum gdb_signal stop_signal)
{
const char *signal_name;
+ PyObject *signal_name_obj = NULL;
PyObject *signal_event_obj =
create_stop_event_object (&signal_event_object_type);
signal_name = gdb_signal_to_name (stop_signal);
+ signal_name_obj = PyString_FromString (signal_name);
+ if (signal_name_obj == NULL)
+ goto fail;
if (evpy_add_attribute (signal_event_obj,
"stop_signal",
- PyString_FromString (signal_name)) < 0)
+ signal_name_obj) < 0)
goto fail;
+ Py_DECREF (signal_name_obj);
return signal_event_obj;
- fail:
- Py_XDECREF (signal_event_obj);
- return NULL;
+ fail:
+ Py_XDECREF (signal_name_obj);
+ Py_XDECREF (signal_event_obj);
+ return NULL;
}
GDBPY_NEW_EVENT_TYPE (signal,
stop_event_obj = create_breakpoint_event_object (list, first_bp);
if (!stop_event_obj)
goto fail;
+ Py_DECREF (list);
}
/* Check if the signal is "Signal 0" or "Trace/breakpoint trap". */
running in non-stop mode then the event is thread specific, otherwise
it is process wide.
This function returns the currently stopped thread in non-stop mode and
- Py_None otherwise. */
+ Py_None otherwise. In each case it returns a borrowed reference. */
static PyObject *
get_event_thread (void)
return NULL;
}
- Py_INCREF (thread);
-
return thread;
}
/* At least python-2.4 had the second parameter non-const. */
if (PyObject_SetAttrString (result, (char *) attrstring, arg) < 0)
goto failarg;
+ Py_DECREF (arg);
}
if (TYPE_FIELD_NAME (type, field))
goto fail;
if (PyObject_SetAttrString (result, "name", arg) < 0)
goto failarg;
+ Py_DECREF (arg);
arg = TYPE_FIELD_ARTIFICIAL (type, field) ? Py_True : Py_False;
Py_INCREF (arg);
if (PyObject_SetAttrString (result, "artificial", arg) < 0)
goto failarg;
+ Py_DECREF (arg);
if (TYPE_CODE (type) == TYPE_CODE_CLASS)
arg = field < TYPE_N_BASECLASSES (type) ? Py_True : Py_False;
Py_INCREF (arg);
if (PyObject_SetAttrString (result, "is_base_class", arg) < 0)
goto failarg;
+ Py_DECREF (arg);
arg = PyLong_FromLong (TYPE_FIELD_BITSIZE (type, field));
if (!arg)
goto fail;
if (PyObject_SetAttrString (result, "bitsize", arg) < 0)
goto failarg;
+ Py_DECREF (arg);
/* A field can have a NULL type in some situations. */
if (TYPE_FIELD_TYPE (type, field) == NULL)
goto fail;
if (PyObject_SetAttrString (result, "type", arg) < 0)
goto failarg;
+ Py_DECREF (arg);
return result;
projects / binutils-gdb.git / commitdiff