OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* python/py-symtab.c (set_sal): Use 

CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION.  Return -1 on error.
	(symtab_and_line_to_sal_object): Update.
This commit is contained in:
Tom Tromey 2013-05-20 20:31:18 +00:00
parent fcb49fc817
commit 33ee792fe5
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2013-05-20 Tom Tromey <tromey@redhat.com>
* python/py-symtab.c (set_sal): Use
CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION. Return -1 on error.
(symtab_and_line_to_sal_object): Update.
2013-05-20 Tom Tromey <tromey@redhat.com> 2013-05-20 Tom Tromey <tromey@redhat.com>
* python/py-param.c (compute_enum_values): Decref 'item'. * python/py-param.c (compute_enum_values): Decref 'item'.

13
gdb/python/py-symtab.c
View File

@ -315,9 +315,8 @@ salpy_dealloc (PyObject *self)
and initialized, populate the sal_object with the struct sal data. and initialized, populate the sal_object with the struct sal data.
Also, register the sal_object life-cycle with the life-cycle of the Also, register the sal_object life-cycle with the life-cycle of the
object file associated with this sal, if needed. If a failure object file associated with this sal, if needed. If a failure
occurs during the sal population, this function will return occurs during the sal population, this function will return -1. */
NULL. */ static int CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION
static int
set_sal (sal_object *sal_obj, struct symtab_and_line sal) set_sal (sal_object *sal_obj, struct symtab_and_line sal)
{ {
symtab_object *symtab_obj; symtab_object *symtab_obj;
@ -328,7 +327,7 @@ set_sal (sal_object *sal_obj, struct symtab_and_line sal)
/* If a symtab existed in the sal, but it cannot be duplicated, /* If a symtab existed in the sal, but it cannot be duplicated,
we exit. */ we exit. */
if (symtab_obj == NULL) if (symtab_obj == NULL)
return 0; return -1;
} }
else else
{ {
@ -356,7 +355,7 @@ set_sal (sal_object *sal_obj, struct symtab_and_line sal)
else else
sal_obj->next = NULL; sal_obj->next = NULL;
return 1; return 0;
} }
/* Given a symtab, and a symtab_object that has previously been /* Given a symtab, and a symtab_object that has previously been
@ -398,7 +397,6 @@ symtab_to_symtab_object (struct symtab *symtab)
that encapsulates the symtab_and_line structure from GDB. */ that encapsulates the symtab_and_line structure from GDB. */
PyObject * PyObject *
symtab_and_line_to_sal_object (struct symtab_and_line sal) symtab_and_line_to_sal_object (struct symtab_and_line sal)
{ {
sal_object *sal_obj; sal_object *sal_obj;
int success = 0; int success = 0;
@ -406,8 +404,7 @@ symtab_and_line_to_sal_object (struct symtab_and_line sal)
sal_obj = PyObject_New (sal_object, &sal_object_type); sal_obj = PyObject_New (sal_object, &sal_object_type);
if (sal_obj) if (sal_obj)
{ {
success = set_sal (sal_obj, sal); if (set_sal (sal_obj, sal) < 0)
if (!success)
{ {
Py_DECREF (sal_obj); Py_DECREF (sal_obj);
return NULL; return NULL;