sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

python/modules: maintain correct refcount for path items

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
This commit is contained in:
Douglas Bagnall 2018-05-03 10:45:39 +12:00 committed by Noel Power
parent e132458039
commit 1f07c478ec
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
python/modules.c
View File

@ -25,16 +25,20 @@
static bool PySys_PathPrepend(PyObject *list, const char *path)
{
bool ok;
PyObject *py_path = PyStr_FromString(path);
if (py_path == NULL)
if (py_path == NULL) {
return false;
return (PyList_Insert(list, 0, py_path) == 0);
}
ok = PyList_Insert(list, 0, py_path) == 0;
Py_XDECREF(py_path);
return ok;
}
bool py_update_path(void)
{
PyObject *mod_sys, *py_path;
PyObject *mod_sys = NULL;
PyObject *py_path = NULL;
mod_sys = PyImport_ImportModule("sys");
if (mod_sys == NULL) {
@ -43,22 +47,27 @@ bool py_update_path(void)
py_path = PyObject_GetAttrString(mod_sys, "path");
if (py_path == NULL) {
return false;
goto error;
}
if (!PyList_Check(py_path)) {
return false;
goto error;
}
if (!PySys_PathPrepend(py_path, dyn_PYTHONDIR)) {
return false;
goto error;
}
if (strcmp(dyn_PYTHONARCHDIR, dyn_PYTHONDIR) != 0) {
if (!PySys_PathPrepend(py_path, dyn_PYTHONARCHDIR)) {
return false;
goto error;
}
}
Py_XDECREF(py_path);
Py_XDECREF(mod_sys);
return true;
error:
Py_XDECREF(py_path);
Py_XDECREF(mod_sys);
return false;
}