The-Homebrew-Cloud/cemu-idapython
2
0
Fork 0
mirror of https://github.com/cemu-project/idapython.git synced 2024-11-24 10:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: unpack_object_from_bv() and unpack_object_from_idb() were leaking objects

Browse Source
This commit is contained in:
elias.bachaalany 2010-04-23 10:51:49 +00:00
parent ecb4232040
commit 3e0343daf5
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
swig/typeinf.i
View File

@ -194,7 +194,7 @@ PyObject *py_get_type_size0(const til_t *ti, PyObject *tp)
return NULL; return NULL;
} }
size_t sz = get_type_size0(ti, (type_t *)PyString_AsString(tp)); size_t sz = get_type_size0(ti, (type_t *)PyString_AsString(tp));
if (sz == BADSIZE) if ( sz == BADSIZE )
Py_RETURN_NONE; Py_RETURN_NONE;
return PyInt_FromLong(sz); return PyInt_FromLong(sz);
} }
@ -208,7 +208,7 @@ PyObject *py_unpack_object_from_idb(
ea_t ea, ea_t ea,
int pio_flags) int pio_flags)
{ {
if (!PyString_Check(py_type) && !PyString_Check(py_fields)) if ( !PyString_Check(py_type) && !PyString_Check(py_fields) )
{ {
PyErr_SetString(PyExc_ValueError, "Typestring must be passed!"); PyErr_SetString(PyExc_ValueError, "Typestring must be passed!");
return NULL; return NULL;
@ -221,16 +221,18 @@ PyObject *py_unpack_object_from_idb(
error_t err = unpack_object_from_idb(&idc_obj, ti, type, fields, ea, NULL, pio_flags); error_t err = unpack_object_from_idb(&idc_obj, ti, type, fields, ea, NULL, pio_flags);
// Unpacking failed? // Unpacking failed?
if (err != eOk) if ( err != eOk )
return Py_BuildValue("(ii)", 0, err); return Py_BuildValue("(ii)", 0, err);
// Convert // Convert
PyObject *py_ret(NULL); PyObject *py_ret(NULL);
err = idcvar_to_pyvar(idc_obj, &py_ret); err = idcvar_to_pyvar(idc_obj, &py_ret);
// Conversion failed? // Conversion failed?
if (err != CIP_OK) if ( err != CIP_OK )
return Py_BuildValue("(ii)", 0, err); return Py_BuildValue("(ii)", 0, err);
return Py_BuildValue("(iO)", 1, py_ret); PyObject *py_result = Py_BuildValue("(iO)", 1, py_ret);
Py_DECREF(py_ret);
return py_result;
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
@ -242,7 +244,7 @@ PyObject *py_unpack_object_from_bv(
PyObject *py_bytes, PyObject *py_bytes,
int pio_flags) int pio_flags)
{ {
if (!PyString_Check(py_type) && !PyString_Check(py_fields) && !PyString_Check(py_bytes)) if ( !PyString_Check(py_type) && !PyString_Check(py_fields) && !PyString_Check(py_bytes) )
{ {
PyErr_SetString(PyExc_ValueError, "Incorrect argument type!"); PyErr_SetString(PyExc_ValueError, "Incorrect argument type!");
return NULL; return NULL;
@ -261,16 +263,18 @@ PyObject *py_unpack_object_from_bv(
error_t err = unpack_object_from_bv(&idc_obj, ti, type, fields, bytes, pio_flags); error_t err = unpack_object_from_bv(&idc_obj, ti, type, fields, bytes, pio_flags);
// Unpacking failed? // Unpacking failed?
if (err != eOk) if ( err != eOk )
return Py_BuildValue("(ii)", 0, err); return Py_BuildValue("(ii)", 0, err);
// Convert // Convert
PyObject *py_ret(NULL); PyObject *py_ret(NULL);
err = idcvar_to_pyvar(idc_obj, &py_ret); err = idcvar_to_pyvar(idc_obj, &py_ret);
// Conversion failed? // Conversion failed?
if (err != CIP_OK) if ( err != CIP_OK )
return Py_BuildValue("(ii)", 0, err); return Py_BuildValue("(ii)", 0, err);
return Py_BuildValue("(iO)", 1, py_ret); PyObject *py_result = Py_BuildValue("(iO)", 1, py_ret);
Py_DECREF(py_ret);
return py_result;
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------