JakeHillion/drgn
1
0
Fork 0
mirror of https://github.com/JakeHillion/drgn.git synced 2024-12-22 09:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

libdrgn: python: add _cleanup_pydecref_ scope guard

Browse Source 
We have tons of cleanup code just for calling Py_DECREF(); this is a
perfect use case for a scope guard. Add it and use it everywhere that it
is straightforward to.

Signed-off-by: Omar Sandoval <osandov@osandov.com>
This commit is contained in:
Omar Sandoval 2023-08-02 08:37:09 -07:00
parent ee51244dc1
commit 91b26e2338
12 changed files with 466 additions and 797 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libdrgn/python/drgnpy.h
View File

@ -11,6 +11,7 @@
#include "structmember.h" #include "structmember.h"
#include "docstrings.h" #include "docstrings.h"
#include "../cleanup.h"
#include "../drgn.h" #include "../drgn.h"
// IWYU pragma: end_exports // IWYU pragma: end_exports
@ -73,6 +74,14 @@
Py_RETURN_FALSE; \ Py_RETURN_FALSE; \
} while (0) } while (0)
static inline void pydecrefp(void *p)
{
Py_XDECREF(*(PyObject **)p);
}
/** Call @c Py_XDECREF() when the variable goes out of scope. */
#define _cleanup_pydecref_ _cleanup_(pydecrefp)
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
struct drgn_object obj; struct drgn_object obj;

41
libdrgn/python/error.c
View File

@ -21,34 +21,26 @@ static int FaultError_init(PyObject *self, PyObject *args, PyObject *kwds)
static PyObject *FaultError_str(PyObject *self) static PyObject *FaultError_str(PyObject *self)
{ {
PyObject *message, *address, *args, *fmt, *ret = NULL; _cleanup_pydecref_ PyObject *message =
PyObject_GetAttrString(self, "message");
message = PyObject_GetAttrString(self, "message");
if (!message) if (!message)
return NULL; return NULL;
address = PyObject_GetAttrString(self, "address"); _cleanup_pydecref_ PyObject *address =
PyObject_GetAttrString(self, "address");
if (!address) if (!address)
goto out_message; return NULL;
args = Py_BuildValue("OO", message, address); _cleanup_pydecref_ PyObject *args =
Py_BuildValue("OO", message, address);
if (!args) if (!args)
goto out_address; return NULL;
fmt = PyUnicode_FromString("%s: %#x"); _cleanup_pydecref_ PyObject *fmt = PyUnicode_FromString("%s: %#x");
if (!fmt) if (!fmt)
goto out_args; return NULL;
ret = PyUnicode_Format(fmt, args); return PyUnicode_Format(fmt, args);
Py_DECREF(fmt);
out_args:
Py_DECREF(args);
out_address:
Py_DECREF(address);
out_message:
Py_DECREF(message);
return ret;
} }
PyTypeObject FaultError_type = { PyTypeObject FaultError_type = {
@ -157,14 +149,11 @@ DRGNPY_PUBLIC void *set_drgn_error(struct drgn_error *err)
PyErr_SetString(PyExc_LookupError, err->message); PyErr_SetString(PyExc_LookupError, err->message);
break; break;
case DRGN_ERROR_FAULT: { case DRGN_ERROR_FAULT: {
PyObject *exc; _cleanup_pydecref_ PyObject *exc =
PyObject_CallFunction((PyObject *)&FaultError_type,
exc = PyObject_CallFunction((PyObject *)&FaultError_type, "sK", "sK", err->message, err->address);
err->message, err->address); if (exc)
if (exc) {
PyErr_SetObject((PyObject *)&FaultError_type, exc); PyErr_SetObject((PyObject *)&FaultError_type, exc);
Py_DECREF(exc);
}
break; break;
} }
case DRGN_ERROR_TYPE: case DRGN_ERROR_TYPE:

66
libdrgn/python/helpers.c
View File

@ -28,8 +28,6 @@ PyObject *drgnpy_linux_helper_read_vm(PyObject *self, PyObject *args,
struct index_arg pgtable = {}; struct index_arg pgtable = {};
struct index_arg address = {}; struct index_arg address = {};
Py_ssize_t size; Py_ssize_t size;
PyObject *buf;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!O&O&n:read_vm", if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!O&O&n:read_vm",
keywords, &Program_type, &prog, keywords, &Program_type, &prog,
index_converter, &pgtable, index_converter, &pgtable,
@ -40,16 +38,14 @@ PyObject *drgnpy_linux_helper_read_vm(PyObject *self, PyObject *args,
PyErr_SetString(PyExc_ValueError, "negative size"); PyErr_SetString(PyExc_ValueError, "negative size");
return NULL; return NULL;
} }
buf = PyBytes_FromStringAndSize(NULL, size); _cleanup_pydecref_ PyObject *buf = PyBytes_FromStringAndSize(NULL, size);
if (!buf) if (!buf)
return NULL; return NULL;
err = linux_helper_read_vm(&prog->prog, pgtable.uvalue, address.uvalue, err = linux_helper_read_vm(&prog->prog, pgtable.uvalue, address.uvalue,
PyBytes_AS_STRING(buf), size); PyBytes_AS_STRING(buf), size);
if (err) { if (err)
Py_DECREF(buf);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(buf);
return buf;
} }
PyObject *drgnpy_linux_helper_follow_phys(PyObject *self, PyObject *args, PyObject *drgnpy_linux_helper_follow_phys(PyObject *self, PyObject *args,
@ -81,21 +77,18 @@ DrgnObject *drgnpy_linux_helper_per_cpu_ptr(PyObject *self, PyObject *args,
struct drgn_error *err; struct drgn_error *err;
DrgnObject *ptr; DrgnObject *ptr;
struct index_arg cpu = {}; struct index_arg cpu = {};
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!O&:per_cpu_ptr", if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!O&:per_cpu_ptr",
keywords, &DrgnObject_type, &ptr, keywords, &DrgnObject_type, &ptr,
index_converter, &cpu)) index_converter, &cpu))
return NULL; return NULL;
DrgnObject *res = DrgnObject_alloc(DrgnObject_prog(ptr)); _cleanup_pydecref_ DrgnObject *res = DrgnObject_alloc(DrgnObject_prog(ptr));
if (!res) if (!res)
return NULL; return NULL;
err = linux_helper_per_cpu_ptr(&res->obj, &ptr->obj, cpu.uvalue); err = linux_helper_per_cpu_ptr(&res->obj, &ptr->obj, cpu.uvalue);
if (err) { if (err)
Py_DECREF(res);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(res);
return res;
} }
DrgnObject *drgnpy_linux_helper_cpu_curr(PyObject *self, PyObject *args, DrgnObject *drgnpy_linux_helper_cpu_curr(PyObject *self, PyObject *args,
@ -105,21 +98,18 @@ DrgnObject *drgnpy_linux_helper_cpu_curr(PyObject *self, PyObject *args,
struct drgn_error *err; struct drgn_error *err;
Program *prog; Program *prog;
struct index_arg cpu = {}; struct index_arg cpu = {};
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!O&:cpu_curr", keywords, if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!O&:cpu_curr", keywords,
&Program_type, &prog, index_converter, &Program_type, &prog, index_converter,
&cpu)) &cpu))
return NULL; return NULL;
DrgnObject *res = DrgnObject_alloc(prog); _cleanup_pydecref_ DrgnObject *res = DrgnObject_alloc(prog);
if (!res) if (!res)
return NULL; return NULL;
err = linux_helper_cpu_curr(&res->obj, cpu.uvalue); err = linux_helper_cpu_curr(&res->obj, cpu.uvalue);
if (err) { if (err)
Py_DECREF(res);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(res);
return res;
} }
DrgnObject *drgnpy_linux_helper_idle_task(PyObject *self, PyObject *args, DrgnObject *drgnpy_linux_helper_idle_task(PyObject *self, PyObject *args,
@ -129,21 +119,18 @@ DrgnObject *drgnpy_linux_helper_idle_task(PyObject *self, PyObject *args,
struct drgn_error *err; struct drgn_error *err;
Program *prog; Program *prog;
struct index_arg cpu = {}; struct index_arg cpu = {};
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!O&:idle_task", keywords, if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!O&:idle_task", keywords,
&Program_type, &prog, index_converter, &Program_type, &prog, index_converter,
&cpu)) &cpu))
return NULL; return NULL;
DrgnObject *res = DrgnObject_alloc(prog); _cleanup_pydecref_ DrgnObject *res = DrgnObject_alloc(prog);
if (!res) if (!res)
return NULL; return NULL;
err = linux_helper_idle_task(&res->obj, cpu.uvalue); err = linux_helper_idle_task(&res->obj, cpu.uvalue);
if (err) { if (err)
Py_DECREF(res);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(res);
return res;
} }
PyObject *drgnpy_linux_helper_task_cpu(PyObject *self, PyObject *args, PyObject *drgnpy_linux_helper_task_cpu(PyObject *self, PyObject *args,
@ -175,15 +162,13 @@ DrgnObject *drgnpy_linux_helper_xa_load(PyObject *self, PyObject *args,
&index)) &index))
return NULL; return NULL;
DrgnObject *res = DrgnObject_alloc(DrgnObject_prog(xa)); _cleanup_pydecref_ DrgnObject *res = DrgnObject_alloc(DrgnObject_prog(xa));
if (!res) if (!res)
return NULL; return NULL;
err = linux_helper_xa_load(&res->obj, &xa->obj, index.uvalue); err = linux_helper_xa_load(&res->obj, &xa->obj, index.uvalue);
if (err) { if (err)
Py_DECREF(res);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(res);
return res;
} }
DrgnObject *drgnpy_linux_helper_idr_find(PyObject *self, PyObject *args, DrgnObject *drgnpy_linux_helper_idr_find(PyObject *self, PyObject *args,
@ -193,22 +178,19 @@ DrgnObject *drgnpy_linux_helper_idr_find(PyObject *self, PyObject *args,
struct drgn_error *err; struct drgn_error *err;
DrgnObject *idr; DrgnObject *idr;
struct index_arg id = {}; struct index_arg id = {};
DrgnObject *res;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!O&:idr_find", keywords, if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!O&:idr_find", keywords,
&DrgnObject_type, &idr, &DrgnObject_type, &idr,
index_converter, &id)) index_converter, &id))
return NULL; return NULL;
res = DrgnObject_alloc(DrgnObject_prog(idr)); _cleanup_pydecref_ DrgnObject *res =
DrgnObject_alloc(DrgnObject_prog(idr));
if (!res) if (!res)
return NULL; return NULL;
err = linux_helper_idr_find(&res->obj, &idr->obj, id.uvalue); err = linux_helper_idr_find(&res->obj, &idr->obj, id.uvalue);
if (err) { if (err)
Py_DECREF(res);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(res);
return res;
} }
struct prog_or_ns_arg { struct prog_or_ns_arg {
@ -295,22 +277,18 @@ DrgnObject *drgnpy_linux_helper_pid_task(PyObject *self, PyObject *args,
struct drgn_error *err; struct drgn_error *err;
DrgnObject *pid; DrgnObject *pid;
struct index_arg pid_type = {}; struct index_arg pid_type = {};
DrgnObject *res;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!O&:pid_task", keywords, if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!O&:pid_task", keywords,
&DrgnObject_type, &pid, &DrgnObject_type, &pid,
index_converter, &pid_type)) index_converter, &pid_type))
return NULL; return NULL;
res = DrgnObject_alloc(DrgnObject_prog(pid)); _cleanup_pydecref_ DrgnObject *res = DrgnObject_alloc(DrgnObject_prog(pid));
if (!res) if (!res)
return NULL; return NULL;
err = linux_helper_pid_task(&res->obj, &pid->obj, pid_type.uvalue); err = linux_helper_pid_task(&res->obj, &pid->obj, pid_type.uvalue);
if (err) { if (err)
Py_DECREF(res);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(res);
return res;
} }
DrgnObject *drgnpy_linux_helper_find_task(PyObject *self, PyObject *args, DrgnObject *drgnpy_linux_helper_find_task(PyObject *self, PyObject *args,

29
libdrgn/python/main.c
View File

@ -188,34 +188,29 @@ static int add_type_aliases(PyObject *m)
return -1; return -1;
} }
PyObject *os_module = PyImport_ImportModule("os"); _cleanup_pydecref_ PyObject *os_module = PyImport_ImportModule("os");
if (!os_module) if (!os_module)
return -1; return -1;
PyObject *os_PathLike = PyObject_GetAttrString(os_module, "PathLike"); _cleanup_pydecref_ PyObject *os_PathLike =
Py_DECREF(os_module); PyObject_GetAttrString(os_module, "PathLike");
if (!os_PathLike) if (!os_PathLike)
return -1; return -1;
PyObject *item = Py_BuildValue("OOO", &PyUnicode_Type, &PyBytes_Type, _cleanup_pydecref_ PyObject *item =
os_PathLike); Py_BuildValue("OOO", &PyUnicode_Type, &PyBytes_Type,
Py_DECREF(os_PathLike); os_PathLike);
if (!item) if (!item)
return -1; return -1;
PyObject *typing_module = PyImport_ImportModule("typing"); _cleanup_pydecref_ PyObject *typing_module =
if (!typing_module) { PyImport_ImportModule("typing");
Py_DECREF(item); if (!typing_module)
return -1; return -1;
} _cleanup_pydecref_ PyObject *typing_Union =
PyObject *typing_Union = PyObject_GetAttrString(typing_module, "Union"); PyObject_GetAttrString(typing_module, "Union");
Py_DECREF(typing_module); if (!typing_Union)
if (!typing_Union) {
Py_DECREF(item);
return -1; return -1;
}
PyObject *Path = PyObject_GetItem(typing_Union, item); PyObject *Path = PyObject_GetItem(typing_Union, item);
Py_DECREF(typing_Union);
Py_DECREF(item);
if (!Path) if (!Path)
return -1; return -1;
if (PyModule_AddObject(m, "Path", Path) == -1) { if (PyModule_AddObject(m, "Path", Path) == -1) {

421
libdrgn/python/object.c
View File

@ -26,11 +26,11 @@ static int DrgnObject_literal(struct drgn_object *res, PyObject *literal)
PyErr_ExceptionMatches(PyExc_OverflowError)) { PyErr_ExceptionMatches(PyExc_OverflowError)) {
is_negative = true; is_negative = true;
PyErr_Clear(); PyErr_Clear();
literal = PyNumber_Negative(literal); _cleanup_pydecref_ PyObject *negated =
if (!literal) PyNumber_Negative(literal);
if (!negated)
return -1; return -1;
uvalue = PyLong_AsUint64(literal); uvalue = PyLong_AsUint64(negated);
Py_DECREF(literal);
} }
if (uvalue == (uint64_t)-1 && PyErr_Occurred()) if (uvalue == (uint64_t)-1 && PyErr_Occurred())
return -1; return -1;
@ -61,7 +61,6 @@ static int serialize_compound_value(struct drgn_program *prog, char *buf,
const struct drgn_object_type *type) const struct drgn_object_type *type)
{ {
struct drgn_error *err; struct drgn_error *err;
int ret = -1;
if (!PyMapping_Check(value_obj)) { if (!PyMapping_Check(value_obj)) {
set_error_type_name("'%s' value must be dictionary or mapping", set_error_type_name("'%s' value must be dictionary or mapping",
@ -69,16 +68,13 @@ static int serialize_compound_value(struct drgn_program *prog, char *buf,
return -1; return -1;
} }
PyObject *tmp = PyMapping_Items(value_obj); _cleanup_pydecref_ PyObject *tmp = PyMapping_Items(value_obj);
if (!tmp) if (!tmp)
return -1; return -1;
// Since Python 3.7, PyMapping_Items() always returns a list. However,
/* // before that, it could also return a tuple.
* Since Python 3.7, PyMapping_Items() always returns a list. However, _cleanup_pydecref_ PyObject *items =
* before that, it could also return a tuple. PySequence_Fast(tmp, "items must be sequence");
*/
PyObject *items = PySequence_Fast(tmp, "items must be sequence");
Py_DECREF(tmp);
if (!items) if (!items)
return -1; return -1;
@ -87,17 +83,17 @@ static int serialize_compound_value(struct drgn_program *prog, char *buf,
PyObject *item = PySequence_Fast_GET_ITEM(items, i); PyObject *item = PySequence_Fast_GET_ITEM(items, i);
if (!PyTuple_Check(item) || PyTuple_GET_SIZE(item) != 2) { if (!PyTuple_Check(item) || PyTuple_GET_SIZE(item) != 2) {
PyErr_SetString(PyExc_TypeError, "invalid item"); PyErr_SetString(PyExc_TypeError, "invalid item");
goto out; return -1;
} }
PyObject *key = PyTuple_GET_ITEM(item, 0); PyObject *key = PyTuple_GET_ITEM(item, 0);
if (!PyUnicode_Check(key)) { if (!PyUnicode_Check(key)) {
PyErr_SetString(PyExc_TypeError, PyErr_SetString(PyExc_TypeError,
"member key must be string"); "member key must be string");
goto out; return -1;
} }
const char *member_name = PyUnicode_AsUTF8(key); const char *member_name = PyUnicode_AsUTF8(key);
if (!member_name) if (!member_name)
goto out; return -1;
struct drgn_type_member *member; struct drgn_type_member *member;
uint64_t member_bit_offset; uint64_t member_bit_offset;
@ -105,7 +101,7 @@ static int serialize_compound_value(struct drgn_program *prog, char *buf,
&member, &member_bit_offset); &member, &member_bit_offset);
if (err) { if (err) {
set_drgn_error(err); set_drgn_error(err);
goto out; return -1;
} }
struct drgn_qualified_type member_qualified_type; struct drgn_qualified_type member_qualified_type;
uint64_t member_bit_field_size; uint64_t member_bit_field_size;
@ -113,25 +109,22 @@ static int serialize_compound_value(struct drgn_program *prog, char *buf,
&member_bit_field_size); &member_bit_field_size);
if (err) { if (err) {
set_drgn_error(err); set_drgn_error(err);
goto out; return -1;
} }
struct drgn_object_type member_type; struct drgn_object_type member_type;
err = drgn_object_type(member_qualified_type, err = drgn_object_type(member_qualified_type,
member_bit_field_size, &member_type); member_bit_field_size, &member_type);
if (err) if (err)
goto out; return -1;
if (serialize_py_object(prog, buf, buf_bit_size, if (serialize_py_object(prog, buf, buf_bit_size,
bit_offset + member_bit_offset, bit_offset + member_bit_offset,
PyTuple_GET_ITEM(item, 1), PyTuple_GET_ITEM(item, 1),
&member_type) == -1) &member_type) == -1)
goto out; return -1;
} }
ret = 0; return 0;
out:
Py_DECREF(items);
return ret;
} }
static int serialize_array_value(struct drgn_program *prog, char *buf, static int serialize_array_value(struct drgn_program *prog, char *buf,
@ -155,7 +148,7 @@ static int serialize_array_value(struct drgn_program *prog, char *buf,
return -1; return -1;
} }
PyObject *seq = PySequence_Fast(value_obj, ""); _cleanup_pydecref_ PyObject *seq = PySequence_Fast(value_obj, "");
if (!seq) { if (!seq) {
if (PyErr_ExceptionMatches(PyExc_TypeError)) { if (PyErr_ExceptionMatches(PyExc_TypeError)) {
set_error_type_name("'%s' value must be iterable", set_error_type_name("'%s' value must be iterable",
@ -165,7 +158,6 @@ static int serialize_array_value(struct drgn_program *prog, char *buf,
} }
size_t seq_length = PySequence_Fast_GET_SIZE(seq); size_t seq_length = PySequence_Fast_GET_SIZE(seq);
if (seq_length > length) { if (seq_length > length) {
Py_DECREF(seq);
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"too many items in array value"); "too many items in array value");
return -1; return -1;
@ -175,13 +167,10 @@ static int serialize_array_value(struct drgn_program *prog, char *buf,
if (serialize_py_object(prog, buf, buf_bit_size, if (serialize_py_object(prog, buf, buf_bit_size,
bit_offset + i * element_type.bit_size, bit_offset + i * element_type.bit_size,
PySequence_Fast_GET_ITEM(seq, i), PySequence_Fast_GET_ITEM(seq, i),
&element_type) == -1) { &element_type) == -1)
Py_DECREF(seq);
return -1; return -1;
}
} }
Py_DECREF(seq);
return 0; return 0;
} }
@ -209,7 +198,8 @@ static int serialize_py_object(struct drgn_program *prog, char *buf,
drgn_object_type_qualified(type)); drgn_object_type_qualified(type));
return -1; return -1;
} }
PyObject *long_obj = PyNumber_Long(value_obj); _cleanup_pydecref_ PyObject *long_obj =
PyNumber_Long(value_obj);
if (!long_obj) if (!long_obj)
return -1; return -1;
union { union {
@ -217,7 +207,6 @@ static int serialize_py_object(struct drgn_program *prog, char *buf,
uint64_t uvalue; uint64_t uvalue;
} tmp; } tmp;
tmp.uvalue = PyLong_AsUint64Mask(long_obj); tmp.uvalue = PyLong_AsUint64Mask(long_obj);
Py_DECREF(long_obj);
if (tmp.uvalue == (uint64_t)-1 && PyErr_Occurred()) if (tmp.uvalue == (uint64_t)-1 && PyErr_Occurred())
return -1; return -1;
if (type->encoding == DRGN_OBJECT_ENCODING_SIGNED) { if (type->encoding == DRGN_OBJECT_ENCODING_SIGNED) {
@ -338,8 +327,6 @@ static DrgnObject *DrgnObject_new(PyTypeObject *subtype, PyObject *args,
struct index_arg bit_offset = { .allow_none = true, .is_none = true }; struct index_arg bit_offset = { .allow_none = true, .is_none = true };
struct index_arg bit_field_size = { .allow_none = true, .is_none = true }; struct index_arg bit_field_size = { .allow_none = true, .is_none = true };
struct drgn_qualified_type qualified_type; struct drgn_qualified_type qualified_type;
DrgnObject *obj;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!|OO$O&O&O&:Object", if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!|OO$O&O&O&:Object",
keywords, &Program_type, &prog, keywords, &Program_type, &prog,
&type_obj, &value_obj, index_converter, &type_obj, &value_obj, index_converter,
@ -356,18 +343,18 @@ static DrgnObject *DrgnObject_new(PyTypeObject *subtype, PyObject *args,
return NULL; return NULL;
} }
obj = DrgnObject_alloc(prog); _cleanup_pydecref_ DrgnObject *obj = DrgnObject_alloc(prog);
if (!obj) if (!obj)
return NULL; return NULL;
if (!address.is_none && value_obj != Py_None) { if (!address.is_none && value_obj != Py_None) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"object cannot have address and value"); "object cannot have address and value");
goto err; return NULL;
} else if (!address.is_none) { } else if (!address.is_none) {
if (!qualified_type.type) { if (!qualified_type.type) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"reference must have type"); "reference must have type");
goto err; return NULL;
} }
err = drgn_object_set_reference(&obj->obj, qualified_type, err = drgn_object_set_reference(&obj->obj, qualified_type,
@ -380,29 +367,29 @@ static DrgnObject *DrgnObject_new(PyTypeObject *subtype, PyObject *args,
if (!bit_offset.is_none) { if (!bit_offset.is_none) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"literal cannot have bit offset"); "literal cannot have bit offset");
goto err; return NULL;
} }
if (!bit_field_size.is_none) { if (!bit_field_size.is_none) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"literal cannot be bit field"); "literal cannot be bit field");
goto err; return NULL;
} }
ret = DrgnObject_literal(&obj->obj, value_obj); ret = DrgnObject_literal(&obj->obj, value_obj);
if (ret == -1) { if (ret == -1) {
goto err; return NULL;
} else if (ret) { } else if (ret) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"cannot create %s literal", "cannot create %s literal",
Py_TYPE(value_obj)->tp_name); Py_TYPE(value_obj)->tp_name);
goto err; return NULL;
} }
err = NULL; err = NULL;
} else if (value_obj != Py_None) { } else if (value_obj != Py_None) {
if (!bit_offset.is_none) { if (!bit_offset.is_none) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"value cannot have bit offset"); "value cannot have bit offset");
goto err; return NULL;
} }
enum drgn_object_encoding encoding = enum drgn_object_encoding encoding =
@ -410,8 +397,7 @@ static DrgnObject *DrgnObject_new(PyTypeObject *subtype, PyObject *args,
if (!drgn_object_encoding_is_complete(encoding)) { if (!drgn_object_encoding_is_complete(encoding)) {
err = drgn_error_incomplete_type("cannot create value with %s type", err = drgn_error_incomplete_type("cannot create value with %s type",
qualified_type.type); qualified_type.type);
set_drgn_error(err); return set_drgn_error(err);
goto err;
} }
if (!bit_field_size.is_none && if (!bit_field_size.is_none &&
@ -419,36 +405,34 @@ static DrgnObject *DrgnObject_new(PyTypeObject *subtype, PyObject *args,
encoding != DRGN_OBJECT_ENCODING_UNSIGNED) { encoding != DRGN_OBJECT_ENCODING_UNSIGNED) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"bit field must be integer"); "bit field must be integer");
goto err; return NULL;
} }
switch (encoding) { switch (encoding) {
case DRGN_OBJECT_ENCODING_BUFFER: case DRGN_OBJECT_ENCODING_BUFFER:
if (buffer_object_from_value(&obj->obj, qualified_type, if (buffer_object_from_value(&obj->obj, qualified_type,
value_obj) == -1) value_obj) == -1)
goto err; return NULL;
err = NULL; err = NULL;
break; break;
case DRGN_OBJECT_ENCODING_SIGNED: case DRGN_OBJECT_ENCODING_SIGNED:
case DRGN_OBJECT_ENCODING_UNSIGNED: { case DRGN_OBJECT_ENCODING_UNSIGNED: {
PyObject *long_obj; if (!PyNumber_Check(value_obj)) {
return set_error_type_name("'%s' value must be number",
qualified_type);
}
_cleanup_pydecref_ PyObject *long_obj =
PyNumber_Long(value_obj);
if (!long_obj)
return NULL;
union { union {
int64_t svalue; int64_t svalue;
uint64_t uvalue; uint64_t uvalue;
} tmp; } tmp = {
.uvalue = PyLong_AsUint64Mask(long_obj)
if (!PyNumber_Check(value_obj)) { };
set_error_type_name("'%s' value must be number",
qualified_type);
goto err;
}
long_obj = PyNumber_Long(value_obj);
if (!long_obj)
goto err;
tmp.uvalue = PyLong_AsUint64Mask(long_obj);
Py_DECREF(long_obj);
if (tmp.uvalue == (uint64_t)-1 && PyErr_Occurred()) if (tmp.uvalue == (uint64_t)-1 && PyErr_Occurred())
goto err; return NULL;
if (encoding == DRGN_OBJECT_ENCODING_SIGNED) { if (encoding == DRGN_OBJECT_ENCODING_SIGNED) {
err = drgn_object_set_signed(&obj->obj, err = drgn_object_set_signed(&obj->obj,
qualified_type, qualified_type,
@ -463,16 +447,13 @@ static DrgnObject *DrgnObject_new(PyTypeObject *subtype, PyObject *args,
break; break;
} }
case DRGN_OBJECT_ENCODING_FLOAT: { case DRGN_OBJECT_ENCODING_FLOAT: {
double fvalue;
if (!PyNumber_Check(value_obj)) { if (!PyNumber_Check(value_obj)) {
set_error_type_name("'%s' value must be number", return set_error_type_name("'%s' value must be number",
qualified_type); qualified_type);
goto err;
} }
fvalue = PyFloat_AsDouble(value_obj); double fvalue = PyFloat_AsDouble(value_obj);
if (fvalue == -1.0 && PyErr_Occurred()) if (fvalue == -1.0 && PyErr_Occurred())
goto err; return NULL;
err = drgn_object_set_float(&obj->obj, qualified_type, err = drgn_object_set_float(&obj->obj, qualified_type,
fvalue); fvalue);
break; break;
@ -484,25 +465,19 @@ static DrgnObject *DrgnObject_new(PyTypeObject *subtype, PyObject *args,
if (!qualified_type.type) { if (!qualified_type.type) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"absent object must have type"); "absent object must have type");
goto err; return NULL;
} }
if (!bit_offset.is_none) { if (!bit_offset.is_none) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"absent object cannot have bit offset"); "absent object cannot have bit offset");
goto err; return NULL;
} }
err = drgn_object_set_absent(&obj->obj, qualified_type, err = drgn_object_set_absent(&obj->obj, qualified_type,
bit_field_size.uvalue); bit_field_size.uvalue);
} }
if (err) { if (err)
set_drgn_error(err); return set_drgn_error(err);
goto err; return_ptr(obj);
}
return obj;
err:
Py_DECREF(obj);
return NULL;
} }
static void DrgnObject_dealloc(DrgnObject *self) static void DrgnObject_dealloc(DrgnObject *self)
@ -557,7 +532,8 @@ static PyObject *DrgnObject_compound_value(struct drgn_object *obj,
goto out; goto out;
} }
PyObject *member_value = DrgnObject_value_impl(&member); _cleanup_pydecref_ PyObject *member_value =
DrgnObject_value_impl(&member);
if (!member_value) { if (!member_value) {
Py_CLEAR(dict); Py_CLEAR(dict);
goto out; goto out;
@ -570,7 +546,6 @@ static PyObject *DrgnObject_compound_value(struct drgn_object *obj,
} else { } else {
ret = PyDict_Update(dict, member_value); ret = PyDict_Update(dict, member_value);
} }
Py_DECREF(member_value);
if (ret) { if (ret) {
Py_CLEAR(dict); Py_CLEAR(dict);
goto out; goto out;
@ -711,40 +686,33 @@ static PyObject *DrgnObject_string(DrgnObject *self)
static DrgnObject *DrgnObject_address_of(DrgnObject *self) static DrgnObject *DrgnObject_address_of(DrgnObject *self)
{ {
struct drgn_error *err; struct drgn_error *err;
DrgnObject *res; _cleanup_pydecref_ DrgnObject *res =
DrgnObject_alloc(DrgnObject_prog(self));
res = DrgnObject_alloc(DrgnObject_prog(self));
if (!res) if (!res)
return NULL; return NULL;
err = drgn_object_address_of(&res->obj, &self->obj); err = drgn_object_address_of(&res->obj, &self->obj);
if (err) { if (err)
Py_DECREF(res);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(res);
return res;
} }
static DrgnObject *DrgnObject_read(DrgnObject *self) static DrgnObject *DrgnObject_read(DrgnObject *self)
{ {
struct drgn_error *err; struct drgn_error *err;
DrgnObject *res;
SWITCH_ENUM(self->obj.kind, SWITCH_ENUM(self->obj.kind,
case DRGN_OBJECT_VALUE: case DRGN_OBJECT_VALUE:
Py_INCREF(self); Py_INCREF(self);
return self; return self;
case DRGN_OBJECT_REFERENCE: case DRGN_OBJECT_REFERENCE: {
res = DrgnObject_alloc(DrgnObject_prog(self)); _cleanup_pydecref_ DrgnObject *res =
DrgnObject_alloc(DrgnObject_prog(self));
if (!res) if (!res)
return NULL; return NULL;
err = drgn_object_read(&res->obj, &self->obj); err = drgn_object_read(&res->obj, &self->obj);
if (err) { if (err)
Py_DECREF(res);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(res);
return res; }
case DRGN_OBJECT_ABSENT: case DRGN_OBJECT_ABSENT:
return set_drgn_error(&drgn_error_object_absent); return set_drgn_error(&drgn_error_object_absent);
) )
@ -753,16 +721,14 @@ static DrgnObject *DrgnObject_read(DrgnObject *self)
static PyObject *DrgnObject_to_bytes(DrgnObject *self) static PyObject *DrgnObject_to_bytes(DrgnObject *self)
{ {
struct drgn_error *err; struct drgn_error *err;
PyObject *buf = PyBytes_FromStringAndSize(NULL, _cleanup_pydecref_ PyObject *buf =
drgn_object_size(&self->obj)); PyBytes_FromStringAndSize(NULL, drgn_object_size(&self->obj));
if (!buf) if (!buf)
return NULL; return NULL;
err = drgn_object_read_bytes(&self->obj, PyBytes_AS_STRING(buf)); err = drgn_object_read_bytes(&self->obj, PyBytes_AS_STRING(buf));
if (err) { if (err)
Py_DECREF(buf);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(buf);
return buf;
} }
static DrgnObject *DrgnObject_from_bytes(PyTypeObject *type, PyObject *args, static DrgnObject *DrgnObject_from_bytes(PyTypeObject *type, PyObject *args,
@ -824,50 +790,40 @@ static int append_bit_offset(PyObject *parts, uint8_t bit_offset)
static PyObject *DrgnObject_repr(DrgnObject *self) static PyObject *DrgnObject_repr(DrgnObject *self)
{ {
struct drgn_error *err; struct drgn_error *err;
PyObject *parts, *tmp, *ret = NULL; _cleanup_pydecref_ PyObject *parts = PyList_New(0);
char *type_name;
parts = PyList_New(0);
if (!parts) if (!parts)
return NULL; return NULL;
char *type_name;
err = drgn_format_type_name(drgn_object_qualified_type(&self->obj), err = drgn_format_type_name(drgn_object_qualified_type(&self->obj),
&type_name); &type_name);
if (err) { if (err)
set_drgn_error(err); return set_drgn_error(err);
goto out; _cleanup_pydecref_ PyObject *tmp = PyUnicode_FromString(type_name);
}
tmp = PyUnicode_FromString(type_name);
free(type_name); free(type_name);
if (!tmp) if (!tmp)
goto out; return NULL;
if (append_format(parts, "Object(prog, %R", tmp) == -1) { if (append_format(parts, "Object(prog, %R", tmp) == -1)
Py_DECREF(tmp); return NULL;
goto out;
}
Py_DECREF(tmp);
SWITCH_ENUM(self->obj.kind, SWITCH_ENUM(self->obj.kind,
case DRGN_OBJECT_VALUE: { case DRGN_OBJECT_VALUE: {
if (append_string(parts, ", value=") == -1) if (append_string(parts, ", value=") == -1)
goto out; return NULL;
PyObject *value_obj = DrgnObject_value(self); _cleanup_pydecref_ PyObject *value_obj = DrgnObject_value(self);
if (!value_obj) if (!value_obj)
goto out; return NULL;
if (drgn_type_kind(drgn_underlying_type(self->obj.type)) == _cleanup_pydecref_ PyObject *part;
DRGN_TYPE_POINTER) if (drgn_type_kind(drgn_underlying_type(self->obj.type))
tmp = PyNumber_ToBase(value_obj, 16); == DRGN_TYPE_POINTER)
part = PyNumber_ToBase(value_obj, 16);
else else
tmp = PyObject_Repr(value_obj); part = PyObject_Repr(value_obj);
Py_DECREF(value_obj); if (!part)
if (!tmp) return NULL;
goto out; if (PyList_Append(parts, part) == -1)
if (PyList_Append(parts, tmp) == -1) { return NULL;
Py_DECREF(tmp);
goto out;
}
Py_DECREF(tmp);
break; break;
} }
case DRGN_OBJECT_REFERENCE: { case DRGN_OBJECT_REFERENCE: {
@ -875,7 +831,7 @@ static PyObject *DrgnObject_repr(DrgnObject *self)
snprintf(buf, sizeof(buf), "%" PRIx64, self->obj.address); snprintf(buf, sizeof(buf), "%" PRIx64, self->obj.address);
if (append_format(parts, ", address=0x%s", buf) == -1 || if (append_format(parts, ", address=0x%s", buf) == -1 ||
append_bit_offset(parts, self->obj.bit_offset) == -1) append_bit_offset(parts, self->obj.bit_offset) == -1)
goto out; return NULL;
break; break;
} }
case DRGN_OBJECT_ABSENT: case DRGN_OBJECT_ABSENT:
@ -885,15 +841,12 @@ static PyObject *DrgnObject_repr(DrgnObject *self)
if (self->obj.is_bit_field && if (self->obj.is_bit_field &&
append_format(parts, ", bit_field_size=%llu", append_format(parts, ", bit_field_size=%llu",
(unsigned long long)self->obj.bit_size) == -1) (unsigned long long)self->obj.bit_size) == -1)
goto out; return NULL;
if (append_string(parts, ")") == -1) if (append_string(parts, ")") == -1)
goto out; return NULL;
ret = join_strings(parts); return join_strings(parts);
out:
Py_DECREF(parts);
return ret;
} }
static PyObject *DrgnObject_str(DrgnObject *self) static PyObject *DrgnObject_str(DrgnObject *self)
@ -1117,22 +1070,18 @@ DrgnObject_BINARY_OP(or)
DrgnObject_BINARY_OP(xor) DrgnObject_BINARY_OP(xor)
#undef DrgnObject_BINARY_OP #undef DrgnObject_BINARY_OP
#define DrgnObject_UNARY_OP(op) \ #define DrgnObject_UNARY_OP(op) \
static DrgnObject *DrgnObject_##op(DrgnObject *self) \ static DrgnObject *DrgnObject_##op(DrgnObject *self) \
{ \ { \
struct drgn_error *err; \ struct drgn_error *err; \
DrgnObject *res; \ _cleanup_pydecref_ DrgnObject *res = \
\ DrgnObject_alloc(DrgnObject_prog(self)); \
res = DrgnObject_alloc(DrgnObject_prog(self)); \ if (!res) \
if (!res) \ return NULL; \
return NULL; \ err = drgn_object_##op(&res->obj, &self->obj); \
\ if (err) \
err = drgn_object_##op(&res->obj, &self->obj); \ return set_drgn_error(err); \
if (err) { \ return_ptr(res); \
Py_DECREF(res); \
return set_drgn_error(err); \
} \
return res; \
} }
DrgnObject_UNARY_OP(pos) DrgnObject_UNARY_OP(pos)
DrgnObject_UNARY_OP(neg) DrgnObject_UNARY_OP(neg)
@ -1255,8 +1204,7 @@ static PyObject *DrgnObject_round(DrgnObject *self, PyObject *args,
PyObject *kwds) PyObject *kwds)
{ {
static char *keywords[] = {"ndigits", NULL}; static char *keywords[] = {"ndigits", NULL};
PyObject *ndigits = Py_None, *value, *ret; PyObject *ndigits = Py_None;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:round", keywords, if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:round", keywords,
&ndigits)) &ndigits))
return NULL; return NULL;
@ -1266,51 +1214,24 @@ static PyObject *DrgnObject_round(DrgnObject *self, PyObject *args,
drgn_object_qualified_type(&self->obj)); drgn_object_qualified_type(&self->obj));
} }
value = DrgnObject_value(self); _cleanup_pydecref_ PyObject *value = DrgnObject_value(self);
if (!value) if (!value)
return NULL; return NULL;
if (ndigits == Py_None) { if (ndigits == Py_None)
ret = PyObject_CallMethod(value, "__round__", NULL); return PyObject_CallMethod(value, "__round__", NULL);
Py_DECREF(value);
} else {
PyObject *args, *kwds, *tmp, *type;
tmp = PyObject_CallMethod(value, "__round__", "O", ndigits); _cleanup_pydecref_ PyObject *rounded_value =
Py_DECREF(value); PyObject_CallMethod(value, "__round__", "O", ndigits);
if (!tmp) if (!rounded_value)
return NULL; return NULL;
value = tmp;
kwds = PyDict_New(); _cleanup_pydecref_ PyObject *type = DrgnObject_get_type(self, NULL);
if (!kwds) { if (!type)
Py_DECREF(value); return NULL;
return NULL; return PyObject_CallFunctionObjArgs((PyObject *)&DrgnObject_type,
} DrgnObject_prog(self), type,
rounded_value, NULL);
if (PyDict_SetItemString(kwds, "value", value) == -1) {
Py_DECREF(value);
return NULL;
}
Py_DECREF(value);
type = DrgnObject_get_type(self, NULL);
if (!type) {
Py_DECREF(kwds);
return NULL;
}
args = Py_BuildValue("OO", DrgnObject_prog(self), type);
Py_DECREF(type);
if (!args) {
Py_DECREF(kwds);
return NULL;
}
ret = PyObject_Call((PyObject *)&DrgnObject_type, args, kwds);
Py_DECREF(args);
Py_DECREF(kwds);
}
return ret;
} }
#define DrgnObject_round_method(func) \ #define DrgnObject_round_method(func) \
@ -1389,13 +1310,12 @@ static DrgnObject *DrgnObject_member(DrgnObject *self, PyObject *args,
static char *keywords[] = {"name", NULL}; static char *keywords[] = {"name", NULL};
struct drgn_error *err; struct drgn_error *err;
const char *name; const char *name;
DrgnObject *res;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "s:member_", keywords, if (!PyArg_ParseTupleAndKeywords(args, kwds, "s:member_", keywords,
&name)) &name))
return NULL; return NULL;
res = DrgnObject_alloc(DrgnObject_prog(self)); _cleanup_pydecref_ DrgnObject *res =
DrgnObject_alloc(DrgnObject_prog(self));
if (!res) if (!res)
return NULL; return NULL;
@ -1405,11 +1325,9 @@ static DrgnObject *DrgnObject_member(DrgnObject *self, PyObject *args,
} else { } else {
err = drgn_object_member(&res->obj, &self->obj, name); err = drgn_object_member(&res->obj, &self->obj, name);
} }
if (err) { if (err)
Py_DECREF(res);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(res);
return res;
} }
static PyObject *DrgnObject_getattro(DrgnObject *self, PyObject *attr_name) static PyObject *DrgnObject_getattro(DrgnObject *self, PyObject *attr_name)
@ -1513,18 +1431,14 @@ static DrgnObject *DrgnObject_subscript_impl(DrgnObject *self,
int64_t index) int64_t index)
{ {
struct drgn_error *err; struct drgn_error *err;
DrgnObject *res; _cleanup_pydecref_ DrgnObject *res =
DrgnObject_alloc(DrgnObject_prog(self));
res = DrgnObject_alloc(DrgnObject_prog(self));
if (!res) if (!res)
return NULL; return NULL;
err = drgn_object_subscript(&res->obj, &self->obj, index); err = drgn_object_subscript(&res->obj, &self->obj, index);
if (err) { if (err)
Py_DECREF(res);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(res);
return res;
} }
static DrgnObject *DrgnObject_subscript(DrgnObject *self, PyObject *key) static DrgnObject *DrgnObject_subscript(DrgnObject *self, PyObject *key)
@ -1571,14 +1485,12 @@ static int add_to_dir(PyObject *dir, struct drgn_type *type)
member = &members[i]; member = &members[i];
if (member->name) { if (member->name) {
PyObject *str = PyUnicode_FromString(member->name); _cleanup_pydecref_ PyObject *str =
PyUnicode_FromString(member->name);
if (!str) if (!str)
return -1; return -1;
if (PyList_Append(dir, str) == -1) { if (PyList_Append(dir, str) == -1)
Py_DECREF(str);
return -1; return -1;
}
Py_DECREF(str);
} else { } else {
struct drgn_qualified_type member_type; struct drgn_qualified_type member_type;
err = drgn_member_type(member, &member_type, NULL); err = drgn_member_type(member, &member_type, NULL);
@ -1596,28 +1508,23 @@ static int add_to_dir(PyObject *dir, struct drgn_type *type)
static PyObject *DrgnObject_dir(DrgnObject *self) static PyObject *DrgnObject_dir(DrgnObject *self)
{ {
_Py_IDENTIFIER(__dir__); _Py_IDENTIFIER(__dir__);
PyObject *method, *dir; _cleanup_pydecref_ PyObject *method =
struct drgn_type *type; _PyObject_GetAttrId((PyObject *)Py_TYPE(self)->tp_base,
&PyId___dir__);
method = _PyObject_GetAttrId((PyObject *)Py_TYPE(self)->tp_base,
&PyId___dir__);
if (!method) if (!method)
return NULL; return NULL;
_cleanup_pydecref_ PyObject *dir =
dir = PyObject_CallFunctionObjArgs(method, self, NULL); PyObject_CallFunctionObjArgs(method, self, NULL);
Py_DECREF(method);
if (!dir) if (!dir)
return NULL; return NULL;
type = drgn_underlying_type(self->obj.type); struct drgn_type *type = drgn_underlying_type(self->obj.type);
if (drgn_type_kind(type) == DRGN_TYPE_POINTER) if (drgn_type_kind(type) == DRGN_TYPE_POINTER)
type = drgn_type_type(type).type; type = drgn_type_type(type).type;
if (add_to_dir(dir, type) == -1) { if (add_to_dir(dir, type) == -1)
Py_DECREF(dir);
return NULL; return NULL;
}
return dir; return_ptr(dir);
} }
static PyGetSetDef DrgnObject_getset[] = { static PyGetSetDef DrgnObject_getset[] = {
@ -1714,24 +1621,11 @@ PyObject *DrgnObject_NULL(PyObject *self, PyObject *args, PyObject *kwds)
{ {
static char *keywords[] = {"prog", "type", NULL}; static char *keywords[] = {"prog", "type", NULL};
PyObject *prog_obj, *type_obj; PyObject *prog_obj, *type_obj;
PyObject *a, *k, *ret;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO:NULL", keywords, if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO:NULL", keywords,
&prog_obj, &type_obj)) &prog_obj, &type_obj))
return NULL; return NULL;
return PyObject_CallFunction((PyObject *)&DrgnObject_type, "OOi",
a = Py_BuildValue("OO", prog_obj, type_obj); prog_obj, type_obj, 0);
if (!a)
return NULL;
k = Py_BuildValue("{s:i}", "value", 0);
if (!k) {
Py_DECREF(a);
return NULL;
}
ret = PyObject_Call((PyObject *)&DrgnObject_type, a, k);
Py_DECREF(k);
Py_DECREF(a);
return ret;
} }
DrgnObject *cast(PyObject *self, PyObject *args, PyObject *kwds) DrgnObject *cast(PyObject *self, PyObject *args, PyObject *kwds)
@ -1740,8 +1634,7 @@ DrgnObject *cast(PyObject *self, PyObject *args, PyObject *kwds)
struct drgn_error *err; struct drgn_error *err;
struct drgn_qualified_type qualified_type; struct drgn_qualified_type qualified_type;
PyObject *type_obj; PyObject *type_obj;
DrgnObject *obj, *res; DrgnObject *obj;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO!:cast", keywords, if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO!:cast", keywords,
&type_obj, &DrgnObject_type, &obj)) &type_obj, &DrgnObject_type, &obj))
return NULL; return NULL;
@ -1750,16 +1643,15 @@ DrgnObject *cast(PyObject *self, PyObject *args, PyObject *kwds)
&qualified_type) == -1) &qualified_type) == -1)
return NULL; return NULL;
res = DrgnObject_alloc(DrgnObject_prog(obj)); _cleanup_pydecref_ DrgnObject *res =
DrgnObject_alloc(DrgnObject_prog(obj));
if (!res) if (!res)
return NULL; return NULL;
err = drgn_object_cast(&res->obj, qualified_type, &obj->obj); err = drgn_object_cast(&res->obj, qualified_type, &obj->obj);
if (err) { if (err)
Py_DECREF(res);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(res);
return res;
} }
DrgnObject *reinterpret(PyObject *self, PyObject *args, PyObject *kwds) DrgnObject *reinterpret(PyObject *self, PyObject *args, PyObject *kwds)
@ -1768,8 +1660,7 @@ DrgnObject *reinterpret(PyObject *self, PyObject *args, PyObject *kwds)
struct drgn_error *err; struct drgn_error *err;
PyObject *type_obj; PyObject *type_obj;
struct drgn_qualified_type qualified_type; struct drgn_qualified_type qualified_type;
DrgnObject *obj, *res; DrgnObject *obj;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO!:reinterpret", if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO!:reinterpret",
keywords, &type_obj, &DrgnObject_type, keywords, &type_obj, &DrgnObject_type,
&obj)) &obj))
@ -1779,16 +1670,15 @@ DrgnObject *reinterpret(PyObject *self, PyObject *args, PyObject *kwds)
&qualified_type) == -1) &qualified_type) == -1)
return NULL; return NULL;
res = DrgnObject_alloc(DrgnObject_prog(obj)); _cleanup_pydecref_ DrgnObject *res =
DrgnObject_alloc(DrgnObject_prog(obj));
if (!res) if (!res)
return NULL; return NULL;
err = drgn_object_reinterpret(&res->obj, qualified_type, &obj->obj); err = drgn_object_reinterpret(&res->obj, qualified_type, &obj->obj);
if (err) { if (err)
Py_DECREF(res);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(res);
return res;
} }
DrgnObject *DrgnObject_container_of(PyObject *self, PyObject *args, DrgnObject *DrgnObject_container_of(PyObject *self, PyObject *args,
@ -1796,11 +1686,10 @@ DrgnObject *DrgnObject_container_of(PyObject *self, PyObject *args,
{ {
static char *keywords[] = {"ptr", "type", "member", NULL}; static char *keywords[] = {"ptr", "type", "member", NULL};
struct drgn_error *err; struct drgn_error *err;
DrgnObject *obj, *res; DrgnObject *obj;
PyObject *type_obj; PyObject *type_obj;
struct drgn_qualified_type qualified_type; struct drgn_qualified_type qualified_type;
const char *member_designator; const char *member_designator;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!Os:container_of", if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!Os:container_of",
keywords, &DrgnObject_type, &obj, keywords, &DrgnObject_type, &obj,
&type_obj, &member_designator)) &type_obj, &member_designator))
@ -1810,17 +1699,15 @@ DrgnObject *DrgnObject_container_of(PyObject *self, PyObject *args,
&qualified_type) == -1) &qualified_type) == -1)
return NULL; return NULL;
res = DrgnObject_alloc(DrgnObject_prog(obj)); _cleanup_pydecref_ DrgnObject *res = DrgnObject_alloc(DrgnObject_prog(obj));
if (!res) if (!res)
return NULL; return NULL;
err = drgn_object_container_of(&res->obj, &obj->obj, qualified_type, err = drgn_object_container_of(&res->obj, &obj->obj, qualified_type,
member_designator); member_designator);
if (err) { if (err)
Py_DECREF(res);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(res);
return res;
} }
static void ObjectIterator_dealloc(ObjectIterator *self) static void ObjectIterator_dealloc(ObjectIterator *self)

37
libdrgn/python/platform.c
View File

@ -83,39 +83,30 @@ static PyObject *Platform_get_flags(Platform *self, void *arg)
static PyObject *Platform_get_registers(Platform *self, void *arg) static PyObject *Platform_get_registers(Platform *self, void *arg)
{ {
size_t num_registers = drgn_platform_num_registers(self->platform); size_t num_registers = drgn_platform_num_registers(self->platform);
PyObject *tuple = PyTuple_New(num_registers); _cleanup_pydecref_ PyObject *tuple = PyTuple_New(num_registers);
if (!tuple) if (!tuple)
return NULL; return NULL;
for (size_t i = 0; i < num_registers; i++) { for (size_t i = 0; i < num_registers; i++) {
const struct drgn_register *reg = const struct drgn_register *reg =
drgn_platform_register(self->platform, i); drgn_platform_register(self->platform, i);
Register *item = call_tp_alloc(Register); Register *item = call_tp_alloc(Register);
if (!item) { if (!item)
Py_DECREF(tuple);
return NULL; return NULL;
}
item->reg = reg; item->reg = reg;
PyTuple_SET_ITEM(tuple, i, (PyObject *)item); PyTuple_SET_ITEM(tuple, i, (PyObject *)item);
} }
return tuple; return_ptr(tuple);
} }
static PyObject *Platform_repr(Platform *self) static PyObject *Platform_repr(Platform *self)
{ {
PyObject *arch_obj, *flags_obj, *ret; _cleanup_pydecref_ PyObject *arch_obj = Platform_get_arch(self, NULL);
arch_obj = Platform_get_arch(self, NULL);
if (!arch_obj) if (!arch_obj)
return NULL; return NULL;
flags_obj = Platform_get_flags(self, NULL); _cleanup_pydecref_ PyObject *flags_obj = Platform_get_flags(self, NULL);
if (!flags_obj) { if (!flags_obj)
Py_DECREF(arch_obj);
return NULL; return NULL;
} return PyUnicode_FromFormat("Platform(%R, %R)", arch_obj, flags_obj);
ret = PyUnicode_FromFormat("Platform(%R, %R)", arch_obj, flags_obj);
Py_XDECREF(flags_obj);
Py_XDECREF(arch_obj);
return ret;
} }
static PyGetSetDef Platform_getset[] = { static PyGetSetDef Platform_getset[] = {
@ -154,26 +145,22 @@ static PyObject *Register_get_names(Register *self, void *arg)
{ {
size_t num_names; size_t num_names;
const char * const *names = drgn_register_names(self->reg, &num_names); const char * const *names = drgn_register_names(self->reg, &num_names);
PyObject *ret = PyTuple_New(num_names); _cleanup_pydecref_ PyObject *ret = PyTuple_New(num_names);
for (size_t i = 0; i < num_names; i++) { for (size_t i = 0; i < num_names; i++) {
PyObject *item = PyUnicode_FromString(names[i]); PyObject *item = PyUnicode_FromString(names[i]);
if (!item) { if (!item)
Py_DECREF(ret);
return NULL; return NULL;
}
PyTuple_SET_ITEM(ret, i, item); PyTuple_SET_ITEM(ret, i, item);
} }
return ret; return_ptr(ret);
} }
static PyObject *Register_repr(Register *self) static PyObject *Register_repr(Register *self)
{ {
PyObject *names_obj = Register_get_names(self, NULL); _cleanup_pydecref_ PyObject *names_obj = Register_get_names(self, NULL);
if (!names_obj) if (!names_obj)
return NULL; return NULL;
PyObject *ret = PyUnicode_FromFormat("Register(%R)", names_obj); return PyUnicode_FromFormat("Register(%R)", names_obj);
Py_DECREF(names_obj);
return ret;
} }
static PyGetSetDef Register_getset[] = { static PyGetSetDef Register_getset[] = {

149
libdrgn/python/program.c
View File

@ -47,12 +47,12 @@ static int get_log_level(void)
// logging.disable() into account. // logging.disable() into account.
int level; int level;
for (level = 0; level < DRGN_LOG_NONE; level++) { for (level = 0; level < DRGN_LOG_NONE; level++) {
PyObject *enabled = PyObject_CallMethod(logger, "isEnabledFor", _cleanup_pydecref_ PyObject *enabled =
"i", (level + 1) * 10); PyObject_CallMethod(logger, "isEnabledFor", "i",
(level + 1) * 10);
if (!enabled) if (!enabled)
return -1; return -1;
int ret = PyObject_IsTrue(enabled); int ret = PyObject_IsTrue(enabled);
Py_DECREF(enabled);
if (ret < 0) if (ret < 0)
return -1; return -1;
if (ret) if (ret)
@ -110,15 +110,13 @@ static int init_logger_cache_wrapper(void)
LoggerCacheWrapper_type.tp_base = &PyDict_Type; LoggerCacheWrapper_type.tp_base = &PyDict_Type;
if (PyType_Ready(&LoggerCacheWrapper_type)) if (PyType_Ready(&LoggerCacheWrapper_type))
return -1; return -1;
PyObject *cache_wrapper = _cleanup_pydecref_ PyObject *cache_wrapper =
PyObject_CallFunction((PyObject *)&LoggerCacheWrapper_type, PyObject_CallFunction((PyObject *)&LoggerCacheWrapper_type,
NULL); NULL);
if (!cache_wrapper) if (!cache_wrapper)
return -1; return -1;
int r = PyObject_SetAttrString(logger, "_cache", cache_wrapper); if (PyObject_SetAttrString(logger, "_cache", cache_wrapper))
Py_DECREF(cache_wrapper); return -1;
if (r)
return r;
return cache_log_level(); return cache_log_level();
} }
@ -160,11 +158,10 @@ int init_logging(void)
if (!percent_s) if (!percent_s)
return -1; return -1;
PyObject *logging = PyImport_ImportModule("logging"); _cleanup_pydecref_ PyObject *logging = PyImport_ImportModule("logging");
if (!logging) if (!logging)
return -1; return -1;
logger = PyObject_CallMethod(logging, "getLogger", "s", "drgn"); logger = PyObject_CallMethod(logging, "getLogger", "s", "drgn");
Py_DECREF(logging);
if (!logger) if (!logger)
return -1; return -1;
logger_log = PyObject_GetAttrString(logger, "log"); logger_log = PyObject_GetAttrString(logger, "log");
@ -257,25 +254,21 @@ static Program *Program_new(PyTypeObject *subtype, PyObject *args,
return NULL; return NULL;
} }
PyObject *cache = PyDict_New(); _cleanup_pydecref_ PyObject *cache = PyDict_New();
if (!cache) if (!cache)
return NULL; return NULL;
Program *prog = call_tp_alloc(Program); _cleanup_pydecref_ Program *prog = call_tp_alloc(Program);
if (!prog) { if (!prog)
Py_DECREF(cache);
return NULL; return NULL;
} prog->cache = no_cleanup_ptr(cache);
prog->cache = cache;
pyobjectp_set_init(&prog->objects); pyobjectp_set_init(&prog->objects);
drgn_program_init(&prog->prog, platform); drgn_program_init(&prog->prog, platform);
drgn_program_set_blocking_callback(&prog->prog, drgnpy_begin_blocking, drgn_program_set_blocking_callback(&prog->prog, drgnpy_begin_blocking,
drgnpy_end_blocking, NULL); drgnpy_end_blocking, NULL);
if (Program_init_logging(prog)) { if (Program_init_logging(prog))
Py_DECREF(prog);
return NULL; return NULL;
} return_ptr(prog);
return prog;
} }
static void Program_dealloc(Program *self) static void Program_dealloc(Program *self)
@ -456,11 +449,10 @@ out_gstate:
static PyObject *Program_add_type_finder(Program *self, PyObject *args, static PyObject *Program_add_type_finder(Program *self, PyObject *args,
PyObject *kwds) PyObject *kwds)
{ {
static char *keywords[] = {"fn", NULL};
struct drgn_error *err; struct drgn_error *err;
PyObject *fn, *arg;
int ret;
static char *keywords[] = {"fn", NULL};
PyObject *fn;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:add_type_finder", if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:add_type_finder",
keywords, &fn)) keywords, &fn))
return NULL; return NULL;
@ -470,12 +462,10 @@ static PyObject *Program_add_type_finder(Program *self, PyObject *args,
return NULL; return NULL;
} }
arg = Py_BuildValue("OO", self, fn); _cleanup_pydecref_ PyObject *arg = Py_BuildValue("OO", self, fn);
if (!arg) if (!arg)
return NULL; return NULL;
ret = Program_hold_object(self, arg); if (Program_hold_object(self, arg))
Py_DECREF(arg);
if (ret == -1)
return NULL; return NULL;
err = drgn_program_add_type_finder(&self->prog, py_type_find_fn, arg); err = drgn_program_add_type_finder(&self->prog, py_type_find_fn, arg);
@ -539,11 +529,10 @@ out_gstate:
static PyObject *Program_add_object_finder(Program *self, PyObject *args, static PyObject *Program_add_object_finder(Program *self, PyObject *args,
PyObject *kwds) PyObject *kwds)
{ {
static char *keywords[] = {"fn", NULL};
struct drgn_error *err; struct drgn_error *err;
PyObject *fn, *arg;
int ret;
static char *keywords[] = {"fn", NULL};
PyObject *fn;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:add_object_finder", if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:add_object_finder",
keywords, &fn)) keywords, &fn))
return NULL; return NULL;
@ -553,12 +542,10 @@ static PyObject *Program_add_object_finder(Program *self, PyObject *args,
return NULL; return NULL;
} }
arg = Py_BuildValue("OO", self, fn); _cleanup_pydecref_ PyObject *arg = Py_BuildValue("OO", self, fn);
if (!arg) if (!arg)
return NULL; return NULL;
ret = Program_hold_object(self, arg); if (Program_hold_object(self, arg))
Py_DECREF(arg);
if (ret == -1)
return NULL; return NULL;
err = drgn_program_add_object_finder(&self->prog, py_object_find_fn, err = drgn_program_add_object_finder(&self->prog, py_object_find_fn,
@ -630,43 +617,35 @@ static PyObject *Program_load_debug_info(Program *self, PyObject *args,
struct path_arg_vector path_args = VECTOR_INIT; struct path_arg_vector path_args = VECTOR_INIT;
const char **paths = NULL; const char **paths = NULL;
if (paths_obj != Py_None) { if (paths_obj != Py_None) {
Py_ssize_t length_hint; _cleanup_pydecref_ PyObject *it = PyObject_GetIter(paths_obj);
PyObject *it, *item;
it = PyObject_GetIter(paths_obj);
if (!it) if (!it)
goto out; goto out;
length_hint = PyObject_LengthHint(paths_obj, 1); Py_ssize_t length_hint = PyObject_LengthHint(paths_obj, 1);
if (length_hint == -1) { if (length_hint == -1)
Py_DECREF(it);
goto out; goto out;
}
if (!path_arg_vector_reserve(&path_args, length_hint)) { if (!path_arg_vector_reserve(&path_args, length_hint)) {
PyErr_NoMemory(); PyErr_NoMemory();
Py_DECREF(it);
goto out; goto out;
} }
while ((item = PyIter_Next(it))) { for (;;) {
struct path_arg *path_arg; _cleanup_pydecref_ PyObject *item = PyIter_Next(it);
int ret; if (!item)
break;
path_arg = path_arg_vector_append_entry(&path_args); struct path_arg *path_arg =
path_arg_vector_append_entry(&path_args);
if (!path_arg) { if (!path_arg) {
PyErr_NoMemory(); PyErr_NoMemory();
Py_DECREF(item);
break; break;
} }
memset(path_arg, 0, sizeof(*path_arg)); memset(path_arg, 0, sizeof(*path_arg));
ret = path_converter(item, path_arg); if (!path_converter(item, path_arg)) {
Py_DECREF(item);
if (!ret) {
path_args.size--; path_args.size--;
break; break;
} }
} }
Py_DECREF(it);
if (PyErr_Occurred()) if (PyErr_Occurred())
goto out; goto out;
@ -710,9 +689,7 @@ static PyObject *Program_read(Program *self, PyObject *args, PyObject *kwds)
struct index_arg address = {}; struct index_arg address = {};
Py_ssize_t size; Py_ssize_t size;
int physical = 0; int physical = 0;
PyObject *buf;
bool clear; bool clear;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&n|p:read", keywords, if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&n|p:read", keywords,
index_converter, &address, &size, index_converter, &address, &size,
&physical)) &physical))
@ -722,7 +699,8 @@ static PyObject *Program_read(Program *self, PyObject *args, PyObject *kwds)
PyErr_SetString(PyExc_ValueError, "negative size"); PyErr_SetString(PyExc_ValueError, "negative size");
return NULL; return NULL;
} }
buf = PyBytes_FromStringAndSize(NULL, size); _cleanup_pydecref_ PyObject *buf =
PyBytes_FromStringAndSize(NULL, size);
if (!buf) if (!buf)
return NULL; return NULL;
clear = set_drgn_in_python(); clear = set_drgn_in_python();
@ -730,11 +708,9 @@ static PyObject *Program_read(Program *self, PyObject *args, PyObject *kwds)
address.uvalue, size, physical); address.uvalue, size, physical);
if (clear) if (clear)
clear_drgn_in_python(); clear_drgn_in_python();
if (err) { if (err)
Py_DECREF(buf);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(buf);
return buf;
} }
#define METHOD_READ(x, type) \ #define METHOD_READ(x, type) \
@ -962,7 +938,7 @@ static PyObject *Program_symbols(Program *self, PyObject *args)
if (err) if (err)
return set_drgn_error(err); return set_drgn_error(err);
PyObject *list = PyList_New(count); _cleanup_pydecref_ PyObject *list = PyList_New(count);
if (!list) { if (!list) {
drgn_symbols_destroy(symbols, count); drgn_symbols_destroy(symbols, count);
return NULL; return NULL;
@ -972,15 +948,13 @@ static PyObject *Program_symbols(Program *self, PyObject *args)
if (!pysym) { if (!pysym) {
/* Free symbols which aren't yet added to list. */ /* Free symbols which aren't yet added to list. */
drgn_symbols_destroy(symbols, count); drgn_symbols_destroy(symbols, count);
/* Free list and all symbols already added. */
Py_DECREF(list);
return NULL; return NULL;
} }
symbols[i] = NULL; symbols[i] = NULL;
PyList_SET_ITEM(list, i, pysym); PyList_SET_ITEM(list, i, pysym);
} }
free(symbols); free(symbols);
return list; return_ptr(list);
} }
static PyObject *Program_symbol(Program *self, PyObject *arg) static PyObject *Program_symbol(Program *self, PyObject *arg)
@ -1089,24 +1063,21 @@ static PyObject *Program__log(Program *self, PyObject *args, PyObject *kwds)
static DrgnObject *Program_subscript(Program *self, PyObject *key) static DrgnObject *Program_subscript(Program *self, PyObject *key)
{ {
struct drgn_error *err; struct drgn_error *err;
const char *name;
DrgnObject *ret;
bool clear;
if (!PyUnicode_Check(key)) { if (!PyUnicode_Check(key)) {
PyErr_SetObject(PyExc_KeyError, key); PyErr_SetObject(PyExc_KeyError, key);
return NULL; return NULL;
} }
name = PyUnicode_AsUTF8(key); const char *name = PyUnicode_AsUTF8(key);
if (!name) if (!name)
return NULL; return NULL;
ret = DrgnObject_alloc(self); _cleanup_pydecref_ DrgnObject *ret = DrgnObject_alloc(self);
if (!ret) if (!ret)
return NULL; return NULL;
clear = set_drgn_in_python(); bool clear = set_drgn_in_python();
err = drgn_program_find_object(&self->prog, name, NULL, err = drgn_program_find_object(&self->prog, name, NULL,
DRGN_FIND_OBJECT_ANY, &ret->obj); DRGN_FIND_OBJECT_ANY, &ret->obj);
if (clear) if (clear)
@ -1118,10 +1089,9 @@ static DrgnObject *Program_subscript(Program *self, PyObject *key)
} else { } else {
set_drgn_error(err); set_drgn_error(err);
} }
Py_DECREF(ret);
return NULL; return NULL;
} }
return ret; return_ptr(ret);
} }
static int Program_contains(Program *self, PyObject *key) static int Program_contains(Program *self, PyObject *key)
@ -1321,14 +1291,13 @@ Program *program_from_core_dump(PyObject *self, PyObject *args, PyObject *kwds)
static char *keywords[] = {"path", NULL}; static char *keywords[] = {"path", NULL};
struct drgn_error *err; struct drgn_error *err;
struct path_arg path = {}; struct path_arg path = {};
Program *prog;
if (!PyArg_ParseTupleAndKeywords(args, kwds, if (!PyArg_ParseTupleAndKeywords(args, kwds,
"O&:program_from_core_dump", keywords, "O&:program_from_core_dump", keywords,
path_converter, &path)) path_converter, &path))
return NULL; return NULL;
prog = (Program *)PyObject_CallObject((PyObject *)&Program_type, NULL); _cleanup_pydecref_ Program *prog =
(Program *)PyObject_CallObject((PyObject *)&Program_type, NULL);
if (!prog) { if (!prog) {
path_cleanup(&path); path_cleanup(&path);
return NULL; return NULL;
@ -1336,49 +1305,39 @@ Program *program_from_core_dump(PyObject *self, PyObject *args, PyObject *kwds)
err = drgn_program_init_core_dump(&prog->prog, path.path); err = drgn_program_init_core_dump(&prog->prog, path.path);
path_cleanup(&path); path_cleanup(&path);
if (err) { if (err)
Py_DECREF(prog);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(prog);
return prog;
} }
Program *program_from_kernel(PyObject *self) Program *program_from_kernel(PyObject *self)
{ {
struct drgn_error *err; struct drgn_error *err;
Program *prog; _cleanup_pydecref_ Program *prog =
(Program *)PyObject_CallObject((PyObject *)&Program_type, NULL);
prog = (Program *)PyObject_CallObject((PyObject *)&Program_type, NULL);
if (!prog) if (!prog)
return NULL; return NULL;
err = drgn_program_init_kernel(&prog->prog); err = drgn_program_init_kernel(&prog->prog);
if (err) { if (err)
Py_DECREF(prog);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(prog);
return prog;
} }
Program *program_from_pid(PyObject *self, PyObject *args, PyObject *kwds) Program *program_from_pid(PyObject *self, PyObject *args, PyObject *kwds)
{ {
static char *keywords[] = {"pid", NULL};
struct drgn_error *err; struct drgn_error *err;
static char *keywords[] = {"pid", NULL};
int pid; int pid;
Program *prog;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "i:program_from_pid", if (!PyArg_ParseTupleAndKeywords(args, kwds, "i:program_from_pid",
keywords, &pid)) keywords, &pid))
return NULL; return NULL;
prog = (Program *)PyObject_CallObject((PyObject *)&Program_type, NULL); _cleanup_pydecref_ Program *prog =
(Program *)PyObject_CallObject((PyObject *)&Program_type, NULL);
if (!prog) if (!prog)
return NULL; return NULL;
err = drgn_program_init_pid(&prog->prog, pid); err = drgn_program_init_pid(&prog->prog, pid);
if (err) { if (err)
Py_DECREF(prog);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(prog);
return prog;
} }

29
libdrgn/python/stack_trace.c
View File

@ -123,7 +123,7 @@ static PyObject *StackFrame_locals(StackFrame *self)
if (err) if (err)
return set_drgn_error(err); return set_drgn_error(err);
PyObject *list = PyList_New(count); _cleanup_pydecref_ PyObject *list = PyList_New(count);
if (!list) { if (!list) {
drgn_stack_frame_locals_destroy(names, count); drgn_stack_frame_locals_destroy(names, count);
return NULL; return NULL;
@ -132,13 +132,12 @@ static PyObject *StackFrame_locals(StackFrame *self)
PyObject *string = PyUnicode_FromString(names[i]); PyObject *string = PyUnicode_FromString(names[i]);
if (!string) { if (!string) {
drgn_stack_frame_locals_destroy(names, count); drgn_stack_frame_locals_destroy(names, count);
Py_DECREF(list);
return NULL; return NULL;
} }
PyList_SET_ITEM(list, i, string); PyList_SET_ITEM(list, i, string);
} }
drgn_stack_frame_locals_destroy(names, count); drgn_stack_frame_locals_destroy(names, count);
return list; return_ptr(list);
} }
static DrgnObject *StackFrame_subscript(StackFrame *self, PyObject *key) static DrgnObject *StackFrame_subscript(StackFrame *self, PyObject *key)
@ -152,7 +151,7 @@ static DrgnObject *StackFrame_subscript(StackFrame *self, PyObject *key)
const char *name = PyUnicode_AsUTF8(key); const char *name = PyUnicode_AsUTF8(key);
if (!name) if (!name)
return NULL; return NULL;
DrgnObject *ret = DrgnObject_alloc(prog); _cleanup_pydecref_ DrgnObject *ret = DrgnObject_alloc(prog);
if (!ret) if (!ret)
return NULL; return NULL;
bool clear = set_drgn_in_python(); bool clear = set_drgn_in_python();
@ -167,10 +166,9 @@ static DrgnObject *StackFrame_subscript(StackFrame *self, PyObject *key)
} else { } else {
set_drgn_error(err); set_drgn_error(err);
} }
Py_DECREF(ret);
return NULL; return NULL;
} }
return ret; return_ptr(ret);
} }
static int StackFrame_contains(StackFrame *self, PyObject *key) static int StackFrame_contains(StackFrame *self, PyObject *key)
@ -253,7 +251,7 @@ static PyObject *StackFrame_register(StackFrame *self, PyObject *arg)
static PyObject *StackFrame_registers(StackFrame *self) static PyObject *StackFrame_registers(StackFrame *self)
{ {
PyObject *dict = PyDict_New(); _cleanup_pydecref_ PyObject *dict = PyDict_New();
if (!dict) if (!dict)
return NULL; return NULL;
const struct drgn_platform *platform = const struct drgn_platform *platform =
@ -266,26 +264,19 @@ static PyObject *StackFrame_registers(StackFrame *self)
if (!drgn_stack_frame_register(self->trace->trace, self->i, reg, if (!drgn_stack_frame_register(self->trace->trace, self->i, reg,
&value)) &value))
continue; continue;
PyObject *value_obj = PyLong_FromUint64(value); _cleanup_pydecref_ PyObject *value_obj =
if (!value_obj) { PyLong_FromUint64(value);
Py_DECREF(dict); if (!value_obj)
return NULL; return NULL;
}
size_t num_names; size_t num_names;
const char * const *names = drgn_register_names(reg, const char * const *names = drgn_register_names(reg,
&num_names); &num_names);
for (size_t j = 0; j < num_names; j++) { for (size_t j = 0; j < num_names; j++) {
int ret = PyDict_SetItemString(dict, names[j], if (PyDict_SetItemString(dict, names[j], value_obj))
value_obj);
if (ret == -1) {
Py_DECREF(value_obj);
Py_DECREF(dict);
return NULL; return NULL;
}
} }
Py_DECREF(value_obj);
} }
return dict; return_ptr(dict);
} }
static PyObject *StackFrame_get_name(StackFrame *self, void *arg) static PyObject *StackFrame_get_name(StackFrame *self, void *arg)

28
libdrgn/python/symbol.c
View File

@ -63,32 +63,22 @@ static PyObject *Symbol_get_kind(Symbol *self, void *arg)
static PyObject *Symbol_repr(Symbol *self) static PyObject *Symbol_repr(Symbol *self)
{ {
PyObject *ret = NULL; _cleanup_pydecref_ PyObject *name =
PyObject *tmp = PyUnicode_FromString(drgn_symbol_name(self->sym)); PyUnicode_FromString(drgn_symbol_name(self->sym));
if (!tmp) if (!name)
return NULL; return NULL;
_cleanup_pydecref_ PyObject *binding = Symbol_get_binding(self, NULL);
PyObject *binding = Symbol_get_binding(self, NULL);
if (!binding) if (!binding)
goto out_tmp; return NULL;
_cleanup_pydecref_ PyObject *kind = Symbol_get_kind(self, NULL);
PyObject *kind = Symbol_get_kind(self, NULL);
if (!kind) if (!kind)
goto out_binding; return NULL;
char address[19], size[19]; char address[19], size[19];
sprintf(address, "0x%" PRIx64, drgn_symbol_address(self->sym)); sprintf(address, "0x%" PRIx64, drgn_symbol_address(self->sym));
sprintf(size, "0x%" PRIx64, drgn_symbol_size(self->sym)); sprintf(size, "0x%" PRIx64, drgn_symbol_size(self->sym));
ret = PyUnicode_FromFormat("Symbol(name=%R, address=%s, size=%s, binding=%R, kind=%R)", return PyUnicode_FromFormat("Symbol(name=%R, address=%s, size=%s, binding=%R, kind=%R)",
tmp, address, size, binding, kind); name, address, size, binding, kind);
Py_DECREF(kind);
out_binding:
Py_DECREF(binding);
out_tmp:
Py_DECREF(tmp);
return ret;
} }
static PyGetSetDef Symbol_getset[] = { static PyGetSetDef Symbol_getset[] = {

14
libdrgn/python/thread.c
View File

@ -12,18 +12,17 @@ static Program *Thread_prog(Thread *self)
PyObject *Thread_wrap(struct drgn_thread *thread) PyObject *Thread_wrap(struct drgn_thread *thread)
{ {
Thread *ret = call_tp_alloc(Thread); _cleanup_pydecref_ Thread *ret = call_tp_alloc(Thread);
if (!ret) if (!ret)
return NULL; return NULL;
struct drgn_error *err = struct drgn_error *err =
drgn_thread_dup_internal(thread, &ret->thread); drgn_thread_dup_internal(thread, &ret->thread);
if (err) { if (err) {
ret->thread.prog = NULL; ret->thread.prog = NULL;
Py_DECREF(ret);
return set_drgn_error(err); return set_drgn_error(err);
} }
Py_INCREF(container_of(thread->prog, Program, prog)); Py_INCREF(container_of(thread->prog, Program, prog));
return (PyObject *)ret; return (PyObject *)no_cleanup_ptr(ret);
} }
static void Thread_dealloc(Thread *self) static void Thread_dealloc(Thread *self)
@ -47,15 +46,14 @@ static DrgnObject *Thread_get_object(Thread *self)
struct drgn_error *err = drgn_thread_object(&self->thread, &object); struct drgn_error *err = drgn_thread_object(&self->thread, &object);
if (err) if (err)
return set_drgn_error(err); return set_drgn_error(err);
DrgnObject *ret = DrgnObject_alloc(Thread_prog(self)); _cleanup_pydecref_ DrgnObject *ret =
DrgnObject_alloc(Thread_prog(self));
if (!ret) if (!ret)
return NULL; return NULL;
err = drgn_object_copy(&ret->obj, object); err = drgn_object_copy(&ret->obj, object);
if (err) { if (err)
Py_DECREF(ret);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(ret);
return ret;
} }
static PyObject *Thread_stack_trace(Thread *self) static PyObject *Thread_stack_trace(Thread *self)

395
libdrgn/python/type.c
View File

@ -23,18 +23,16 @@ static const char *drgn_type_kind_str(struct drgn_type *type)
DRGNPY_PUBLIC PyObject *DrgnType_wrap(struct drgn_qualified_type qualified_type) DRGNPY_PUBLIC PyObject *DrgnType_wrap(struct drgn_qualified_type qualified_type)
{ {
DrgnType *type_obj = call_tp_alloc(DrgnType); _cleanup_pydecref_ DrgnType *type_obj = call_tp_alloc(DrgnType);
if (!type_obj) if (!type_obj)
return NULL; return NULL;
type_obj->type = qualified_type.type; type_obj->type = qualified_type.type;
type_obj->qualifiers = qualified_type.qualifiers; type_obj->qualifiers = qualified_type.qualifiers;
Py_INCREF(DrgnType_prog(type_obj)); Py_INCREF(DrgnType_prog(type_obj));
type_obj->attr_cache = PyDict_New(); type_obj->attr_cache = PyDict_New();
if (!type_obj->attr_cache) { if (!type_obj->attr_cache)
Py_DECREF(type_obj);
return NULL; return NULL;
} return (PyObject *)no_cleanup_ptr(type_obj);
return (PyObject *)type_obj;
} }
static inline struct drgn_qualified_type DrgnType_unwrap(DrgnType *type) static inline struct drgn_qualified_type DrgnType_unwrap(DrgnType *type)
@ -181,7 +179,7 @@ static TypeMember *TypeMember_wrap(PyObject *parent,
struct drgn_type_member *member, struct drgn_type_member *member,
uint64_t bit_offset) uint64_t bit_offset)
{ {
TypeMember *py_member = call_tp_alloc(TypeMember); _cleanup_pydecref_ TypeMember *py_member = call_tp_alloc(TypeMember);
if (!py_member) if (!py_member)
return NULL; return NULL;
@ -191,27 +189,19 @@ static TypeMember *TypeMember_wrap(PyObject *parent,
if (member->name) { if (member->name) {
py_member->name = PyUnicode_FromString(member->name); py_member->name = PyUnicode_FromString(member->name);
if (!py_member->name) if (!py_member->name)
goto err; return NULL;
} else { } else {
Py_INCREF(Py_None); Py_INCREF(Py_None);
py_member->name = Py_None; py_member->name = Py_None;
} }
py_member->bit_offset = PyLong_FromUint64(bit_offset); py_member->bit_offset = PyLong_FromUint64(bit_offset);
if (!py_member->bit_offset) if (!py_member->bit_offset)
goto err; return NULL;
return py_member; return_ptr(py_member);
err:
Py_DECREF(py_member);
return NULL;
} }
static PyObject *DrgnType_get_members(DrgnType *self) static PyObject *DrgnType_get_members(DrgnType *self)
{ {
PyObject *members_obj;
struct drgn_type_member *members;
size_t num_members, i;
if (!drgn_type_has_members(self->type)) { if (!drgn_type_has_members(self->type)) {
return PyErr_Format(PyExc_AttributeError, return PyErr_Format(PyExc_AttributeError,
"%s type does not have members", "%s type does not have members",
@ -221,34 +211,26 @@ static PyObject *DrgnType_get_members(DrgnType *self)
if (!drgn_type_is_complete(self->type)) if (!drgn_type_is_complete(self->type))
Py_RETURN_NONE; Py_RETURN_NONE;
members = drgn_type_members(self->type); struct drgn_type_member *members = drgn_type_members(self->type);
num_members = drgn_type_num_members(self->type); size_t num_members = drgn_type_num_members(self->type);
members_obj = PyTuple_New(num_members);
_cleanup_pydecref_ PyObject *members_obj = PyTuple_New(num_members);
if (!members_obj) if (!members_obj)
return NULL; return NULL;
for (i = 0; i < num_members; i++) { for (size_t i = 0; i < num_members; i++) {
TypeMember *item = TypeMember_wrap((PyObject *)self, TypeMember *item = TypeMember_wrap((PyObject *)self,
&members[i], &members[i],
members[i].bit_offset); members[i].bit_offset);
if (!item) if (!item)
goto err; return NULL;
PyTuple_SET_ITEM(members_obj, i, (PyObject *)item); PyTuple_SET_ITEM(members_obj, i, (PyObject *)item);
} }
return members_obj; return_ptr(members_obj);
err:
Py_DECREF(members_obj);
return NULL;
} }
static PyObject *DrgnType_get_enumerators(DrgnType *self) static PyObject *DrgnType_get_enumerators(DrgnType *self)
{ {
PyObject *enumerators_obj;
const struct drgn_type_enumerator *enumerators;
bool is_signed;
size_t num_enumerators, i;
if (!drgn_type_has_enumerators(self->type)) { if (!drgn_type_has_enumerators(self->type)) {
return PyErr_Format(PyExc_AttributeError, return PyErr_Format(PyExc_AttributeError,
"%s type does not have enumerators", "%s type does not have enumerators",
@ -258,15 +240,16 @@ static PyObject *DrgnType_get_enumerators(DrgnType *self)
if (!drgn_type_is_complete(self->type)) if (!drgn_type_is_complete(self->type))
Py_RETURN_NONE; Py_RETURN_NONE;
enumerators = drgn_type_enumerators(self->type); const struct drgn_type_enumerator *enumerators =
num_enumerators = drgn_type_num_enumerators(self->type); drgn_type_enumerators(self->type);
is_signed = drgn_enum_type_is_signed(self->type); size_t num_enumerators = drgn_type_num_enumerators(self->type);
bool is_signed = drgn_enum_type_is_signed(self->type);
enumerators_obj = PyTuple_New(num_enumerators); _cleanup_pydecref_ PyObject *enumerators_obj = PyTuple_New(num_enumerators);
if (!enumerators_obj) if (!enumerators_obj)
return NULL; return NULL;
for (i = 0; i < num_enumerators; i++) { for (size_t i = 0; i < num_enumerators; i++) {
PyObject *item; PyObject *item;
if (is_signed) { if (is_signed) {
@ -278,39 +261,36 @@ static PyObject *DrgnType_get_enumerators(DrgnType *self)
"sK", enumerators[i].name, "sK", enumerators[i].name,
(unsigned long long)enumerators[i].uvalue); (unsigned long long)enumerators[i].uvalue);
} }
if (!item) { if (!item)
Py_DECREF(enumerators_obj);
return NULL; return NULL;
}
PyTuple_SET_ITEM(enumerators_obj, i, item); PyTuple_SET_ITEM(enumerators_obj, i, item);
} }
return enumerators_obj; return_ptr(enumerators_obj);
} }
static PyObject *DrgnType_get_parameters(DrgnType *self) static PyObject *DrgnType_get_parameters(DrgnType *self)
{ {
PyObject *parameters_obj;
struct drgn_type_parameter *parameters;
size_t num_parameters, i;
if (!drgn_type_has_parameters(self->type)) { if (!drgn_type_has_parameters(self->type)) {
return PyErr_Format(PyExc_AttributeError, return PyErr_Format(PyExc_AttributeError,
"%s type does not have parameters", "%s type does not have parameters",
drgn_type_kind_str(self->type)); drgn_type_kind_str(self->type));
} }
parameters = drgn_type_parameters(self->type); struct drgn_type_parameter *parameters =
num_parameters = drgn_type_num_parameters(self->type); drgn_type_parameters(self->type);
parameters_obj = PyTuple_New(num_parameters); size_t num_parameters = drgn_type_num_parameters(self->type);
_cleanup_pydecref_ PyObject *parameters_obj =
PyTuple_New(num_parameters);
if (!parameters_obj) if (!parameters_obj)
return NULL; return NULL;
for (i = 0; i < num_parameters; i++) { for (size_t i = 0; i < num_parameters; i++) {
struct drgn_type_parameter *parameter = &parameters[i]; struct drgn_type_parameter *parameter = &parameters[i];
TypeParameter *item = call_tp_alloc(TypeParameter); TypeParameter *item = call_tp_alloc(TypeParameter);
if (!item) if (!item)
goto err; return NULL;
PyTuple_SET_ITEM(parameters_obj, i, (PyObject *)item); PyTuple_SET_ITEM(parameters_obj, i, (PyObject *)item);
Py_INCREF(self); Py_INCREF(self);
item->lazy_obj.obj = (PyObject *)self; item->lazy_obj.obj = (PyObject *)self;
@ -318,17 +298,13 @@ static PyObject *DrgnType_get_parameters(DrgnType *self)
if (parameter->name) { if (parameter->name) {
item->name = PyUnicode_FromString(parameter->name); item->name = PyUnicode_FromString(parameter->name);
if (!item->name) if (!item->name)
goto err; return NULL;
} else { } else {
Py_INCREF(Py_None); Py_INCREF(Py_None);
item->name = Py_None; item->name = Py_None;
} }
} }
return parameters_obj; return_ptr(parameters_obj);
err:
Py_DECREF(parameters_obj);
return NULL;
} }
static PyObject *DrgnType_get_is_variadic(DrgnType *self) static PyObject *DrgnType_get_is_variadic(DrgnType *self)
@ -353,7 +329,9 @@ static PyObject *DrgnType_get_template_parameters(DrgnType *self)
drgn_type_template_parameters(self->type); drgn_type_template_parameters(self->type);
size_t num_template_parameters = size_t num_template_parameters =
drgn_type_num_template_parameters(self->type); drgn_type_num_template_parameters(self->type);
PyObject *template_parameters_obj = PyTuple_New(num_template_parameters);
_cleanup_pydecref_ PyObject *template_parameters_obj =
PyTuple_New(num_template_parameters);
if (!template_parameters_obj) if (!template_parameters_obj)
return NULL; return NULL;
@ -364,7 +342,7 @@ static PyObject *DrgnType_get_template_parameters(DrgnType *self)
TypeTemplateParameter *item = TypeTemplateParameter *item =
call_tp_alloc(TypeTemplateParameter); call_tp_alloc(TypeTemplateParameter);
if (!item) if (!item)
goto err; return NULL;
PyTuple_SET_ITEM(template_parameters_obj, i, (PyObject *)item); PyTuple_SET_ITEM(template_parameters_obj, i, (PyObject *)item);
Py_INCREF(self); Py_INCREF(self);
item->lazy_obj.obj = (PyObject *)self; item->lazy_obj.obj = (PyObject *)self;
@ -372,7 +350,7 @@ static PyObject *DrgnType_get_template_parameters(DrgnType *self)
if (template_parameter->name) { if (template_parameter->name) {
item->name = PyUnicode_FromString(template_parameter->name); item->name = PyUnicode_FromString(template_parameter->name);
if (!item->name) if (!item->name)
goto err; return NULL;
} else { } else {
Py_INCREF(Py_None); Py_INCREF(Py_None);
item->name = Py_None; item->name = Py_None;
@ -380,11 +358,7 @@ static PyObject *DrgnType_get_template_parameters(DrgnType *self)
item->is_default = item->is_default =
PyBool_FromLong(template_parameter->is_default); PyBool_FromLong(template_parameter->is_default);
} }
return template_parameters_obj; return_ptr(template_parameters_obj);
err:
Py_DECREF(template_parameters_obj);
return NULL;
} }
struct DrgnType_Attr { struct DrgnType_Attr {
@ -506,35 +480,27 @@ static int DrgnType_clear(DrgnType *self)
static int append_field(PyObject *parts, bool *first, const char *format, ...) static int append_field(PyObject *parts, bool *first, const char *format, ...)
{ {
va_list ap;
PyObject *str;
int ret;
if (!*first && append_string(parts, ", ") == -1) if (!*first && append_string(parts, ", ") == -1)
return -1; return -1;
*first = false; *first = false;
va_list ap;
va_start(ap, format); va_start(ap, format);
str = PyUnicode_FromFormatV(format, ap); _cleanup_pydecref_ PyObject *str = PyUnicode_FromFormatV(format, ap);
va_end(ap); va_end(ap);
if (!str) if (!str)
return -1; return -1;
return PyList_Append(parts, str);
ret = PyList_Append(parts, str);
Py_DECREF(str);
return ret;
} }
#define append_member(parts, type_obj, first, member) ({ \ #define append_member(parts, type_obj, first, member) ({ \
int _ret = 0; \ int _ret = 0; \
PyObject *_obj; \
\
if (drgn_type_has_##member((type_obj)->type)) { \ if (drgn_type_has_##member((type_obj)->type)) { \
_obj = DrgnType_getter((type_obj), &DrgnType_attr_##member); \ _cleanup_pydecref_ PyObject *_obj = \
DrgnType_getter((type_obj), &DrgnType_attr_##member); \
if (_obj) { \ if (_obj) { \
_ret = append_field((parts), (first), #member"=%R", \ _ret = append_field((parts), (first), #member"=%R", \
_obj); \ _obj); \
Py_DECREF(_obj); \
} else { \ } else { \
_ret = -1; \ _ret = -1; \
} \ } \
@ -544,87 +510,74 @@ static int append_field(PyObject *parts, bool *first, const char *format, ...)
static PyObject *DrgnType_repr(DrgnType *self) static PyObject *DrgnType_repr(DrgnType *self)
{ {
PyObject *parts = PyList_New(0); _cleanup_pydecref_ PyObject *parts = PyList_New(0);
if (!parts) if (!parts)
return NULL; return NULL;
PyObject *ret = NULL;
bool first = true; bool first = true;
if (append_format(parts, "prog.%s_type(", if (append_format(parts, "prog.%s_type(",
drgn_type_kind_str(self->type)) == -1) drgn_type_kind_str(self->type)) == -1)
goto out; return NULL;
if (append_member(parts, self, &first, name) == -1) if (append_member(parts, self, &first, name) == -1)
goto out; return NULL;
if (append_member(parts, self, &first, tag) == -1) if (append_member(parts, self, &first, tag) == -1)
goto out; return NULL;
if (drgn_type_kind(self->type) != DRGN_TYPE_POINTER && if (drgn_type_kind(self->type) != DRGN_TYPE_POINTER &&
append_member(parts, self, &first, size) == -1) append_member(parts, self, &first, size) == -1)
goto out; return NULL;
if (append_member(parts, self, &first, is_signed) == -1) if (append_member(parts, self, &first, is_signed) == -1)
goto out; return NULL;
if (append_member(parts, self, &first, type) == -1) if (append_member(parts, self, &first, type) == -1)
goto out; return NULL;
if (drgn_type_kind(self->type) == DRGN_TYPE_POINTER && if (drgn_type_kind(self->type) == DRGN_TYPE_POINTER &&
(!drgn_type_program(self->type)->has_platform || (!drgn_type_program(self->type)->has_platform ||
drgn_type_size(self->type) != drgn_type_size(self->type) !=
drgn_platform_address_size(&drgn_type_program(self->type)->platform)) && drgn_platform_address_size(&drgn_type_program(self->type)->platform)) &&
append_member(parts, self, &first, size) == -1) append_member(parts, self, &first, size) == -1)
goto out; return NULL;
if (drgn_type_has_little_endian(self->type) && if (drgn_type_has_little_endian(self->type) &&
(!drgn_type_program(self->type)->has_platform || (!drgn_type_program(self->type)->has_platform ||
drgn_type_little_endian(self->type) != drgn_type_little_endian(self->type) !=
drgn_platform_is_little_endian(&drgn_type_program(self->type)->platform))) { drgn_platform_is_little_endian(&drgn_type_program(self->type)->platform))) {
PyObject *obj = DrgnType_get_byteorder(self, NULL); _cleanup_pydecref_ PyObject *obj =
if (!obj) DrgnType_get_byteorder(self, NULL);
goto out; if (!obj
if (append_field(parts, &first, "byteorder=%R", obj) == -1) { || append_field(parts, &first, "byteorder=%R", obj) == -1)
Py_DECREF(obj); return NULL;
goto out;
}
Py_DECREF(obj);
} }
if (append_member(parts, self, &first, length) == -1) if (append_member(parts, self, &first, length) == -1)
goto out; return NULL;
if (append_member(parts, self, &first, members) == -1) if (append_member(parts, self, &first, members) == -1)
goto out; return NULL;
if (append_member(parts, self, &first, enumerators) == -1) if (append_member(parts, self, &first, enumerators) == -1)
goto out; return NULL;
if (append_member(parts, self, &first, parameters) == -1) if (append_member(parts, self, &first, parameters) == -1)
goto out; return NULL;
if (append_member(parts, self, &first, is_variadic) == -1) if (append_member(parts, self, &first, is_variadic) == -1)
goto out; return NULL;
if (drgn_type_has_template_parameters(self->type) && if (drgn_type_has_template_parameters(self->type) &&
drgn_type_num_template_parameters(self->type) > 0 && drgn_type_num_template_parameters(self->type) > 0 &&
append_member(parts, self, &first, template_parameters) == -1) append_member(parts, self, &first, template_parameters) == -1)
goto out; return NULL;
if (self->qualifiers) { if (self->qualifiers) {
PyObject *obj = DrgnType_getter(self, _cleanup_pydecref_ PyObject *obj =
&DrgnType_attr_qualifiers); DrgnType_getter(self, &DrgnType_attr_qualifiers);
if (!obj) if (!obj
goto out; || append_field(parts, &first, "qualifiers=%R", obj) == -1)
if (append_field(parts, &first, "qualifiers=%R", obj) == -1) { return NULL;
Py_DECREF(obj);
goto out;
}
Py_DECREF(obj);
} }
if (drgn_type_language(self->type) != if (drgn_type_language(self->type) !=
drgn_program_language(drgn_type_program(self->type))) { drgn_program_language(drgn_type_program(self->type))) {
PyObject *obj = DrgnType_get_language(self, NULL); _cleanup_pydecref_ PyObject *obj = DrgnType_get_language(self, NULL);
if (append_field(parts, &first, "language=%R", obj) == -1) { if (!obj
Py_DECREF(obj); || append_field(parts, &first, "language=%R", obj) == -1)
goto out; return NULL;
}
Py_DECREF(obj);
} }
if (append_string(parts, ")") == -1) if (append_string(parts, ")") == -1)
goto out; return NULL;
ret = join_strings(parts); return join_strings(parts);
out:
Py_DECREF(parts);
return ret;
} }
static PyObject *DrgnType_str(DrgnType *self) static PyObject *DrgnType_str(DrgnType *self)
@ -867,16 +820,14 @@ PyTypeObject TypeEnumerator_type = {
static DrgnObject *DrgnType_to_absent_DrgnObject(DrgnType *type) static DrgnObject *DrgnType_to_absent_DrgnObject(DrgnType *type)
{ {
DrgnObject *obj = DrgnObject_alloc(DrgnType_prog(type)); _cleanup_pydecref_ DrgnObject *obj = DrgnObject_alloc(DrgnType_prog(type));
if (!obj) if (!obj)
return NULL; return NULL;
struct drgn_error *err = struct drgn_error *err =
drgn_object_set_absent(&obj->obj, DrgnType_unwrap(type), 0); drgn_object_set_absent(&obj->obj, DrgnType_unwrap(type), 0);
if (err) { if (err)
Py_DECREF(obj);
return set_drgn_error(err); return set_drgn_error(err);
} return_ptr(obj);
return obj;
} }
static const char *PyType_name(PyTypeObject *type) static const char *PyType_name(PyTypeObject *type)
@ -982,11 +933,11 @@ static int append_lazy_object_repr(PyObject *parts, LazyObject *self)
set_drgn_error(err); set_drgn_error(err);
return -1; return -1;
} }
PyObject *tmp = PyUnicode_FromString(type_name); _cleanup_pydecref_ PyObject *tmp = PyUnicode_FromString(type_name);
free(type_name); free(type_name);
int ret = append_format(parts, "prog.type(%R)", tmp); if (!tmp)
Py_DECREF(tmp); return -1;
return ret; return append_format(parts, "prog.type(%R)", tmp);
} else { } else {
return append_format(parts, "%R", object); return append_format(parts, "%R", object);
} }
@ -1048,7 +999,8 @@ static TypeMember *TypeMember_new(PyTypeObject *subtype, PyObject *args,
if (LazyObject_arg(object, "TypeMember", true, &obj, &state)) if (LazyObject_arg(object, "TypeMember", true, &obj, &state))
return NULL; return NULL;
TypeMember *member = (TypeMember *)subtype->tp_alloc(subtype, 0); _cleanup_pydecref_ TypeMember *member =
(TypeMember *)subtype->tp_alloc(subtype, 0);
if (!member) { if (!member) {
Py_DECREF(obj); Py_DECREF(obj);
return NULL; return NULL;
@ -1062,14 +1014,10 @@ static TypeMember *TypeMember_new(PyTypeObject *subtype, PyObject *args,
} else { } else {
bit_offset = PyLong_FromLong(0); bit_offset = PyLong_FromLong(0);
if (!bit_offset) if (!bit_offset)
goto err; return NULL;
} }
member->bit_offset = bit_offset; member->bit_offset = bit_offset;
return member; return_ptr(member);
err:
Py_DECREF(member);
return NULL;
} }
static void TypeMember_dealloc(TypeMember *self) static void TypeMember_dealloc(TypeMember *self)
@ -1105,22 +1053,19 @@ static PyObject *TypeMember_get_bit_field_size(TypeMember *self, void *arg)
static PyObject *TypeMember_repr(TypeMember *self) static PyObject *TypeMember_repr(TypeMember *self)
{ {
PyObject *parts = PyList_New(0), *ret = NULL; _cleanup_pydecref_ PyObject *parts = PyList_New(0);
if (!parts) if (!parts)
return NULL; return NULL;
if (append_format(parts, "TypeMember(") < 0 || if (append_format(parts, "TypeMember(") < 0 ||
append_lazy_object_repr(parts, (LazyObject *)self) < 0) append_lazy_object_repr(parts, (LazyObject *)self) < 0)
goto out; return NULL;
if (self->name != Py_None && if (self->name != Py_None &&
append_format(parts, ", name=%R", self->name) < 0) append_format(parts, ", name=%R", self->name) < 0)
goto out; return NULL;
/* Include the bit offset even if it is the default of 0 for clarity. */ /* Include the bit offset even if it is the default of 0 for clarity. */
if (append_format(parts, ", bit_offset=%R)", self->bit_offset) < 0) if (append_format(parts, ", bit_offset=%R)", self->bit_offset) < 0)
goto out; return NULL;
ret = join_strings(parts); return join_strings(parts);
out:
Py_DECREF(parts);
return ret;
} }
static PyMemberDef TypeMember_members[] = { static PyMemberDef TypeMember_members[] = {
@ -1198,21 +1143,18 @@ static void TypeParameter_dealloc(TypeParameter *self)
static PyObject *TypeParameter_repr(TypeParameter *self) static PyObject *TypeParameter_repr(TypeParameter *self)
{ {
PyObject *parts = PyList_New(0), *ret = NULL; _cleanup_pydecref_ PyObject *parts = PyList_New(0);
if (!parts) if (!parts)
return NULL; return NULL;
if (append_format(parts, "TypeParameter(") < 0 || if (append_format(parts, "TypeParameter(") < 0 ||
append_lazy_object_repr(parts, (LazyObject *)self) < 0) append_lazy_object_repr(parts, (LazyObject *)self) < 0)
goto out; return NULL;
if (self->name != Py_None && if (self->name != Py_None &&
append_format(parts, ", name=%R", self->name) < 0) append_format(parts, ", name=%R", self->name) < 0)
goto out; return NULL;
if (append_string(parts, ")") < 0) if (append_string(parts, ")") < 0)
goto out; return NULL;
ret = join_strings(parts); return join_strings(parts);
out:
Py_DECREF(parts);
return ret;
} }
static PyMemberDef TypeParameter_members[] = { static PyMemberDef TypeParameter_members[] = {
@ -1290,24 +1232,21 @@ static void TypeTemplateParameter_dealloc(TypeTemplateParameter *self)
static PyObject *TypeTemplateParameter_repr(TypeTemplateParameter *self) static PyObject *TypeTemplateParameter_repr(TypeTemplateParameter *self)
{ {
PyObject *parts = PyList_New(0), *ret = NULL; _cleanup_pydecref_ PyObject *parts = PyList_New(0);
if (!parts) if (!parts)
return NULL; return NULL;
if (append_format(parts, "TypeTemplateParameter(") < 0 || if (append_format(parts, "TypeTemplateParameter(") < 0 ||
append_lazy_object_repr(parts, (LazyObject *)self) < 0) append_lazy_object_repr(parts, (LazyObject *)self) < 0)
goto out; return NULL;
if (self->name != Py_None && if (self->name != Py_None &&
append_format(parts, ", name=%R", self->name) < 0) append_format(parts, ", name=%R", self->name) < 0)
goto out; return NULL;
if (self->is_default == Py_True && if (self->is_default == Py_True &&
append_string(parts, ", is_default=True") < 0) append_string(parts, ", is_default=True") < 0)
goto out; return NULL;
if (append_string(parts, ")") < 0) if (append_string(parts, ")") < 0)
goto out; return NULL;
ret = join_strings(parts); return join_strings(parts);
out:
Py_DECREF(parts);
return ret;
} }
static PyObject *TypeTemplateParameter_get_argument(TypeTemplateParameter *self, static PyObject *TypeTemplateParameter_get_argument(TypeTemplateParameter *self,
@ -1443,18 +1382,17 @@ DrgnType *Program_int_type(Program *self, PyObject *args, PyObject *kwds)
Program_hold_object(self, name_obj); Program_hold_object(self, name_obj);
qualified_type.qualifiers = qualifiers; qualified_type.qualifiers = qualifiers;
DrgnType *type_obj = (DrgnType *)DrgnType_wrap(qualified_type); _cleanup_pydecref_ DrgnType *type_obj =
(DrgnType *)DrgnType_wrap(qualified_type);
if (!type_obj) if (!type_obj)
return NULL; return NULL;
if (drgn_type_name(qualified_type.type) == name && if (drgn_type_name(qualified_type.type) == name &&
_PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_name.id, _PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_name.id,
name_obj) == -1) { name_obj) == -1)
Py_DECREF(type_obj);
return NULL; return NULL;
}
return type_obj; return_ptr(type_obj);
} }
DrgnType *Program_bool_type(Program *self, PyObject *args, PyObject *kwds) DrgnType *Program_bool_type(Program *self, PyObject *args, PyObject *kwds)
@ -1499,18 +1437,17 @@ DrgnType *Program_bool_type(Program *self, PyObject *args, PyObject *kwds)
Program_hold_object(self, name_obj); Program_hold_object(self, name_obj);
qualified_type.qualifiers = qualifiers; qualified_type.qualifiers = qualifiers;
DrgnType *type_obj = (DrgnType *)DrgnType_wrap(qualified_type); _cleanup_pydecref_ DrgnType *type_obj =
(DrgnType *)DrgnType_wrap(qualified_type);
if (!type_obj) if (!type_obj)
return NULL; return NULL;
if (drgn_type_name(qualified_type.type) == name && if (drgn_type_name(qualified_type.type) == name &&
_PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_name.id, _PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_name.id,
name_obj) == -1) { name_obj) == -1)
Py_DECREF(type_obj);
return NULL; return NULL;
}
return type_obj; return_ptr(type_obj);
} }
DrgnType *Program_float_type(Program *self, PyObject *args, PyObject *kwds) DrgnType *Program_float_type(Program *self, PyObject *args, PyObject *kwds)
@ -1556,18 +1493,17 @@ DrgnType *Program_float_type(Program *self, PyObject *args, PyObject *kwds)
Program_hold_object(self, name_obj); Program_hold_object(self, name_obj);
qualified_type.qualifiers = qualifiers; qualified_type.qualifiers = qualifiers;
DrgnType *type_obj = (DrgnType *)DrgnType_wrap(qualified_type); _cleanup_pydecref_ DrgnType *type_obj =
(DrgnType *)DrgnType_wrap(qualified_type);
if (!type_obj) if (!type_obj)
return NULL; return NULL;
if (drgn_type_name(qualified_type.type) == name && if (drgn_type_name(qualified_type.type) == name &&
_PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_name.id, _PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_name.id,
name_obj) == -1) { name_obj) == -1)
Py_DECREF(type_obj);
return NULL; return NULL;
}
return type_obj; return_ptr(type_obj);
} }
static struct drgn_error *py_lazy_object_thunk_fn(struct drgn_object *res, static struct drgn_error *py_lazy_object_thunk_fn(struct drgn_object *res,
@ -1726,7 +1662,7 @@ static DrgnType *Program_compound_type(Program *self, PyObject *args,
return NULL; return NULL;
} }
PyObject *cached_members; _cleanup_pydecref_ PyObject *cached_members = NULL;
size_t num_members; size_t num_members;
if (members_obj == Py_None) { if (members_obj == Py_None) {
if (!size.is_none) { if (!size.is_none) {
@ -1735,7 +1671,6 @@ static DrgnType *Program_compound_type(Program *self, PyObject *args,
drgn_type_kind_spelling[kind]); drgn_type_kind_spelling[kind]);
return NULL; return NULL;
} }
cached_members = NULL;
num_members = 0; num_members = 0;
} else { } else {
if (size.is_none) { if (size.is_none) {
@ -1755,7 +1690,7 @@ static DrgnType *Program_compound_type(Program *self, PyObject *args,
} }
bool can_cache_members = true; bool can_cache_members = true;
PyObject *cached_template_parameters; _cleanup_pydecref_ PyObject *cached_template_parameters;
if (template_parameters_obj) { if (template_parameters_obj) {
cached_template_parameters = cached_template_parameters =
PySequence_Tuple(template_parameters_obj); PySequence_Tuple(template_parameters_obj);
@ -1763,7 +1698,7 @@ static DrgnType *Program_compound_type(Program *self, PyObject *args,
cached_template_parameters = PyTuple_New(0); cached_template_parameters = PyTuple_New(0);
} }
if (!cached_template_parameters) if (!cached_template_parameters)
goto err_members; return NULL;
size_t num_template_parameters = size_t num_template_parameters =
PyTuple_GET_SIZE(cached_template_parameters); PyTuple_GET_SIZE(cached_template_parameters);
bool can_cache_template_parameters = true; bool can_cache_template_parameters = true;
@ -1798,7 +1733,7 @@ static DrgnType *Program_compound_type(Program *self, PyObject *args,
set_drgn_error(err); set_drgn_error(err);
err_builder: err_builder:
drgn_compound_type_builder_deinit(&builder); drgn_compound_type_builder_deinit(&builder);
goto err_template_parameters; return NULL;
} }
if (tag_obj != Py_None && drgn_type_tag(qualified_type.type) == tag) if (tag_obj != Py_None && drgn_type_tag(qualified_type.type) == tag)
@ -1809,9 +1744,10 @@ err_builder:
Program_hold_object(self, cached_template_parameters); Program_hold_object(self, cached_template_parameters);
qualified_type.qualifiers = qualifiers; qualified_type.qualifiers = qualifiers;
DrgnType *type_obj = (DrgnType *)DrgnType_wrap(qualified_type); _cleanup_pydecref_ DrgnType *type_obj =
(DrgnType *)DrgnType_wrap(qualified_type);
if (!type_obj) if (!type_obj)
goto err_template_parameters; return NULL;
if (_PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_tag.id, if (_PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_tag.id,
tag_obj) == -1 || tag_obj) == -1 ||
@ -1823,19 +1759,9 @@ err_builder:
_PyDict_SetItemId(type_obj->attr_cache, _PyDict_SetItemId(type_obj->attr_cache,
&DrgnType_attr_template_parameters.id, &DrgnType_attr_template_parameters.id,
cached_template_parameters) == -1)) cached_template_parameters) == -1))
goto err_type; return NULL;
Py_XDECREF(cached_members);
Py_DECREF(cached_template_parameters);
return type_obj; return_ptr(type_obj);
err_type:
Py_DECREF(type_obj);
err_template_parameters:
Py_DECREF(cached_template_parameters);
err_members:
Py_XDECREF(cached_members);
return NULL;
} }
DrgnType *Program_struct_type(Program *self, PyObject *args, PyObject *kwds) DrgnType *Program_struct_type(Program *self, PyObject *args, PyObject *kwds)
@ -1930,7 +1856,7 @@ DrgnType *Program_enum_type(Program *self, PyObject *args, PyObject *kwds)
return NULL; return NULL;
} }
PyObject *cached_enumerators; _cleanup_pydecref_ PyObject *cached_enumerators = NULL;
struct drgn_qualified_type qualified_type; struct drgn_qualified_type qualified_type;
struct drgn_error *err; struct drgn_error *err;
if (enumerators_obj == Py_None) { if (enumerators_obj == Py_None) {
@ -1948,8 +1874,6 @@ DrgnType *Program_enum_type(Program *self, PyObject *args, PyObject *kwds)
&qualified_type.type); &qualified_type.type);
if (err) if (err)
return set_drgn_error(err); return set_drgn_error(err);
cached_enumerators = NULL;
} else { } else {
if (compatible_type_obj == Py_None) { if (compatible_type_obj == Py_None) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
@ -1986,7 +1910,7 @@ DrgnType *Program_enum_type(Program *self, PyObject *args, PyObject *kwds)
if (unpack_enumerator(&builder, if (unpack_enumerator(&builder,
PyTuple_GET_ITEM(cached_enumerators, i), PyTuple_GET_ITEM(cached_enumerators, i),
is_signed) == -1) is_signed) == -1)
goto err_enumerators; return NULL;
} }
if (!Program_hold_reserve(self, 1 + (tag_obj != Py_None))) if (!Program_hold_reserve(self, 1 + (tag_obj != Py_None)))
@ -1998,7 +1922,7 @@ DrgnType *Program_enum_type(Program *self, PyObject *args, PyObject *kwds)
set_drgn_error(err); set_drgn_error(err);
err_builder: err_builder:
drgn_enum_type_builder_deinit(&builder); drgn_enum_type_builder_deinit(&builder);
goto err_enumerators; return NULL;
} }
Program_hold_object(self, cached_enumerators); Program_hold_object(self, cached_enumerators);
@ -2008,9 +1932,10 @@ err_builder:
Program_hold_object(self, tag_obj); Program_hold_object(self, tag_obj);
qualified_type.qualifiers = qualifiers; qualified_type.qualifiers = qualifiers;
DrgnType *type_obj = (DrgnType *)DrgnType_wrap(qualified_type); _cleanup_pydecref_ DrgnType *type_obj =
(DrgnType *)DrgnType_wrap(qualified_type);
if (!type_obj) if (!type_obj)
goto err_enumerators; return NULL;
if (_PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_tag.id, if (_PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_tag.id,
tag_obj) == -1 || tag_obj) == -1 ||
@ -2020,16 +1945,9 @@ err_builder:
&DrgnType_attr_enumerators.id, &DrgnType_attr_enumerators.id,
cached_enumerators ? cached_enumerators ?
cached_enumerators : Py_None) == -1) cached_enumerators : Py_None) == -1)
goto err_type; return NULL;
Py_XDECREF(cached_enumerators);
return type_obj; return_ptr(type_obj);
err_type:
Py_DECREF(type_obj);
err_enumerators:
Py_XDECREF(cached_enumerators);
return NULL;
} }
DrgnType *Program_typedef_type(Program *self, PyObject *args, PyObject *kwds) DrgnType *Program_typedef_type(Program *self, PyObject *args, PyObject *kwds)
@ -2068,19 +1986,18 @@ DrgnType *Program_typedef_type(Program *self, PyObject *args, PyObject *kwds)
Program_hold_object(self, name_obj); Program_hold_object(self, name_obj);
qualified_type.qualifiers = qualifiers; qualified_type.qualifiers = qualifiers;
DrgnType *type_obj = (DrgnType *)DrgnType_wrap(qualified_type); _cleanup_pydecref_ DrgnType *type_obj =
(DrgnType *)DrgnType_wrap(qualified_type);
if (!type_obj) if (!type_obj)
return NULL; return NULL;
if (_PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_type.id, if (_PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_type.id,
(PyObject *)aliased_type_obj) == -1 || (PyObject *)aliased_type_obj) == -1 ||
_PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_name.id, _PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_name.id,
name_obj) == -1) { name_obj) == -1)
Py_DECREF(type_obj);
return NULL; return NULL;
}
return type_obj; return_ptr(type_obj);
} }
DrgnType *Program_pointer_type(Program *self, PyObject *args, PyObject *kwds) DrgnType *Program_pointer_type(Program *self, PyObject *args, PyObject *kwds)
@ -2124,17 +2041,16 @@ DrgnType *Program_pointer_type(Program *self, PyObject *args, PyObject *kwds)
if (err) if (err)
return set_drgn_error(err); return set_drgn_error(err);
qualified_type.qualifiers = qualifiers; qualified_type.qualifiers = qualifiers;
DrgnType *type_obj = (DrgnType *)DrgnType_wrap(qualified_type); _cleanup_pydecref_ DrgnType *type_obj =
(DrgnType *)DrgnType_wrap(qualified_type);
if (!type_obj) if (!type_obj)
return NULL; return NULL;
if (_PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_type.id, if (_PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_type.id,
(PyObject *)referenced_type_obj) == -1) { (PyObject *)referenced_type_obj) == -1)
Py_DECREF(type_obj);
return NULL; return NULL;
}
return type_obj; return_ptr(type_obj);
} }
DrgnType *Program_array_type(Program *self, PyObject *args, PyObject *kwds) DrgnType *Program_array_type(Program *self, PyObject *args, PyObject *kwds)
@ -2170,17 +2086,16 @@ DrgnType *Program_array_type(Program *self, PyObject *args, PyObject *kwds)
if (err) if (err)
return set_drgn_error(err); return set_drgn_error(err);
qualified_type.qualifiers = qualifiers; qualified_type.qualifiers = qualifiers;
DrgnType *type_obj = (DrgnType *)DrgnType_wrap(qualified_type); _cleanup_pydecref_ DrgnType *type_obj =
(DrgnType *)DrgnType_wrap(qualified_type);
if (!type_obj) if (!type_obj)
return NULL; return NULL;
if (_PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_type.id, if (_PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_type.id,
(PyObject *)element_type_obj) == -1) { (PyObject *)element_type_obj) == -1)
Py_DECREF(type_obj);
return NULL; return NULL;
}
return type_obj; return_ptr(type_obj);
} }
static int unpack_parameter(struct drgn_function_type_builder *builder, static int unpack_parameter(struct drgn_function_type_builder *builder,
@ -2245,13 +2160,14 @@ DrgnType *Program_function_type(Program *self, PyObject *args, PyObject *kwds)
return NULL; return NULL;
} }
PyObject *cached_parameters = PySequence_Tuple(parameters_obj); _cleanup_pydecref_ PyObject *cached_parameters =
PySequence_Tuple(parameters_obj);
if (!cached_parameters) if (!cached_parameters)
return NULL; return NULL;
size_t num_parameters = PyTuple_GET_SIZE(cached_parameters); size_t num_parameters = PyTuple_GET_SIZE(cached_parameters);
bool can_cache_parameters = true; bool can_cache_parameters = true;
PyObject *cached_template_parameters; _cleanup_pydecref_ PyObject *cached_template_parameters;
if (template_parameters_obj) { if (template_parameters_obj) {
cached_template_parameters = cached_template_parameters =
PySequence_Tuple(template_parameters_obj); PySequence_Tuple(template_parameters_obj);
@ -2259,7 +2175,7 @@ DrgnType *Program_function_type(Program *self, PyObject *args, PyObject *kwds)
cached_template_parameters = PyTuple_New(0); cached_template_parameters = PyTuple_New(0);
} }
if (!cached_template_parameters) if (!cached_template_parameters)
goto err_parameters; return NULL;
size_t num_template_parameters = size_t num_template_parameters =
PyTuple_GET_SIZE(cached_template_parameters); PyTuple_GET_SIZE(cached_template_parameters);
bool can_cache_template_parameters = true; bool can_cache_template_parameters = true;
@ -2294,7 +2210,7 @@ DrgnType *Program_function_type(Program *self, PyObject *args, PyObject *kwds)
set_drgn_error(err); set_drgn_error(err);
err_builder: err_builder:
drgn_function_type_builder_deinit(&builder); drgn_function_type_builder_deinit(&builder);
goto err_template_parameters; return NULL;
} }
if (num_parameters > 0) if (num_parameters > 0)
@ -2303,9 +2219,10 @@ err_builder:
Program_hold_object(self, cached_template_parameters); Program_hold_object(self, cached_template_parameters);
qualified_type.qualifiers = qualifiers; qualified_type.qualifiers = qualifiers;
DrgnType *type_obj = (DrgnType *)DrgnType_wrap(qualified_type); _cleanup_pydecref_ DrgnType *type_obj =
(DrgnType *)DrgnType_wrap(qualified_type);
if (!type_obj) if (!type_obj)
goto err_template_parameters; return NULL;
if (_PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_type.id, if (_PyDict_SetItemId(type_obj->attr_cache, &DrgnType_attr_type.id,
(PyObject *)return_type_obj) == -1 || (PyObject *)return_type_obj) == -1 ||
@ -2317,17 +2234,7 @@ err_builder:
_PyDict_SetItemId(type_obj->attr_cache, _PyDict_SetItemId(type_obj->attr_cache,
&DrgnType_attr_template_parameters.id, &DrgnType_attr_template_parameters.id,
cached_template_parameters) == -1)) cached_template_parameters) == -1))
goto err_type; return NULL;
Py_DECREF(cached_parameters);
Py_DECREF(cached_template_parameters);
return type_obj; return_ptr(type_obj);
err_type:
Py_DECREF(type_obj);
err_template_parameters:
Py_DECREF(cached_template_parameters);
err_parameters:
Py_DECREF(cached_parameters);
return NULL;
} }

45
libdrgn/python/util.c
View File

@ -7,30 +7,18 @@
int append_string(PyObject *parts, const char *s) int append_string(PyObject *parts, const char *s)
{ {
PyObject *str; _cleanup_pydecref_ PyObject *str = PyUnicode_FromString(s);
int ret;
str = PyUnicode_FromString(s);
if (!str) if (!str)
return -1; return -1;
return PyList_Append(parts, str);
ret = PyList_Append(parts, str);
Py_DECREF(str);
return ret;
} }
static int append_formatv(PyObject *parts, const char *format, va_list ap) static int append_formatv(PyObject *parts, const char *format, va_list ap)
{ {
PyObject *str; _cleanup_pydecref_ PyObject *str = PyUnicode_FromFormatV(format, ap);
int ret;
str = PyUnicode_FromFormatV(format, ap);
if (!str) if (!str)
return -1; return -1;
return PyList_Append(parts, str);
ret = PyList_Append(parts, str);
Py_DECREF(str);
return ret;
} }
int append_format(PyObject *parts, const char *format, ...) int append_format(PyObject *parts, const char *format, ...)
@ -46,12 +34,10 @@ int append_format(PyObject *parts, const char *format, ...)
PyObject *join_strings(PyObject *parts) PyObject *join_strings(PyObject *parts)
{ {
PyObject *sep = PyUnicode_New(0, 0); _cleanup_pydecref_ PyObject *sep = PyUnicode_New(0, 0);
if (!sep) if (!sep)
return NULL; return NULL;
PyObject *ret = PyUnicode_Join(sep, parts); return PyUnicode_Join(sep, parts);
Py_DECREF(sep);
return ret;
} }
PyObject *repr_pretty_from_str(PyObject *self, PyObject *args, PyObject *kwds) PyObject *repr_pretty_from_str(PyObject *self, PyObject *args, PyObject *kwds)
@ -66,33 +52,28 @@ PyObject *repr_pretty_from_str(PyObject *self, PyObject *args, PyObject *kwds)
if (cycle) if (cycle)
return PyObject_CallMethod(p, "text", "s", "..."); return PyObject_CallMethod(p, "text", "s", "...");
PyObject *str_obj = PyObject_Str(self); _cleanup_pydecref_ PyObject *str_obj = PyObject_Str(self);
if (!str_obj) if (!str_obj)
return NULL; return NULL;
PyObject *ret = PyObject_CallMethod(p, "text", "O", str_obj); return PyObject_CallMethod(p, "text", "O", str_obj);
Py_DECREF(str_obj);
return ret;
} }
int index_converter(PyObject *o, void *p) int index_converter(PyObject *o, void *p)
{ {
struct index_arg *arg = p; struct index_arg *arg = p;
PyObject *index_obj;
arg->is_none = o == Py_None; arg->is_none = o == Py_None;
if (arg->allow_none && arg->is_none) if (arg->allow_none && arg->is_none)
return 1; return 1;
index_obj = PyNumber_Index(o); _cleanup_pydecref_ PyObject *index_obj = PyNumber_Index(o);
if (!index_obj) if (!index_obj)
return 0; return 0;
if (arg->is_signed) { if (arg->is_signed) {
arg->svalue = PyLong_AsLongLong(index_obj); arg->svalue = PyLong_AsLongLong(index_obj);
Py_DECREF(index_obj);
return (arg->svalue != -1LL || !PyErr_Occurred()); return (arg->svalue != -1LL || !PyErr_Occurred());
} else { } else {
arg->uvalue = PyLong_AsUnsignedLongLong(index_obj); arg->uvalue = PyLong_AsUnsignedLongLong(index_obj);
Py_DECREF(index_obj);
return (arg->uvalue != -1ULL || !PyErr_Occurred()); return (arg->uvalue != -1ULL || !PyErr_Occurred());
} }
} }
@ -144,12 +125,10 @@ int enum_converter(PyObject *o, void *p)
return 0; return 0;
} }
o = PyObject_GetAttrString(o, "value"); _cleanup_pydecref_ PyObject *value = PyObject_GetAttrString(o, "value");
if (!o) if (!value)
return 0; return 0;
arg->value = PyLong_AsUnsignedLong(value);
arg->value = PyLong_AsUnsignedLong(o);
Py_DECREF(o);
if (arg->value == -1 && PyErr_Occurred()) if (arg->value == -1 && PyErr_Occurred())
return 0; return 0;
return 1; return 1;