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

Backported fixes

Browse Source
This commit is contained in:
Arnaud Diederen
2020-01-13 09:23:59 +01:00
parent bf7a817c1d
commit 3ba7253294
6 changed files with 125 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idapython.cpp
+13 -3
View File
@@ -840,7 +840,7 @@ static bool return_python_result(
// We use the Python function to execute the script because it knows how to deal with
// module reloading.
static bool IDAPython_ExecFile(
const char *FileName,
const char *path,
PyObject *globals,
qstring *errbuf,
const char *idaapi_script = S_IDAAPI_EXECSCRIPT,
@@ -856,12 +856,22 @@ static bool IDAPython_ExecFile(
}
char script[MAXSTR];
qstrncpy(script, FileName, sizeof(script));
qstrncpy(script, path, sizeof(script));
strrpl(script, '\\', '/');
newref_t py_script(IDAPyStr_FromUTF8(script));
if ( globals == NULL )
globals = get_module_globals();
newref_t py_script(IDAPyStr_FromUTF8(script));
if ( globals != get_module_globals() )
{
// Executions that take place in the scope of their own module,
// should have the '__file__' attribute properly set (so that
// it doesn't just get temporarily set and then removed by
// `ida_idaapi.IDAPython_ExecScript`.
newref_t py_file_key(IDAPyStr_FromUTF8(S_FILE));
if ( !PyDict_Contains(globals, py_file_key.o) )
PyDict_SetItem(globals, py_file_key.o, py_script.o);
}
borref_t py_false(Py_False);
newref_t py_ret(PyObject_CallFunctionObjArgs(
py_execscript.o,