admin/idapython-src
1
0
Fork 0
mirror of https://github.com/idapython/src synced 2026-06-08 14:47:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40 from 0xeb/choose_ongetattr

Browse Source 
+ bugfix: IDAPython: Choose.OnGetLineAttr was broken
This commit is contained in:
Arnaud Diederen
2023-01-18 10:09:31 +01:00
committed by GitHub
parent 000531ae46 1284df5188
commit 4d3da678c0
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pywraps.hpp
+1
View File
@@ -326,6 +326,7 @@ struct ref_t
bool operator==(const ref_t &other) const { return o == other.o; }
bool operator!=(const ref_t &other) const { return !((*this) == other); }
explicit operator bool() const { return o != nullptr; }
};
//-------------------------------------------------------------------------
pywraps/py_kernwin_choose.hpp
+11 -8
View File
@@ -478,15 +478,18 @@ void py_chooser_mixin_t::mixin_get_row(
PyObject_CallMethod(
self.o, (char *)S_ON_GET_LINE_ATTR,
"i", int(n)));
if ( PyErr_Occurred() != nullptr )
return;
if ( pyres.result != nullptr && PyList_Check(pyres.result.o) )
if ( PyErr_Occurred() == nullptr && pyres.result != nullptr && PySequence_Check(pyres.result.o) )
{
PyObject *item;
if ( (item = PyList_GetItem(pyres.result.o, 0)) != nullptr )
attrs->color = PyInt_AsLong(item);
if ( (item = PyList_GetItem(pyres.result.o, 1)) != nullptr )
attrs->flags = PyInt_AsLong(item);
{
newref_t item(PySequence_GetItem(pyres.result.o, 0));
if (item && PyLong_Check(item.o))
attrs->color = PyLong_AsUnsignedLong(item.o);
}
{
newref_t item(PySequence_GetItem(pyres.result.o, 1));
if (item && PyLong_Check(item.o))
attrs->flags = PyInt_AsLong(item.o);
}
}
}
}