# HG changeset patch
# User ZyX <[email protected]>
# Date 1370688053 -14400
# Sat Jun 08 14:40:53 2013 +0400
# Branch python-path
# Node ID a40ac5f7feca2a9af9c6d1eb0f746b7e01da7d10
# Parent 5af09dbe636d979f376b6bebc3c043d7cc89aed4
Fix memory leaks
diff -r 5af09dbe636d -r a40ac5f7feca src/if_py_both.h
--- a/src/if_py_both.h Sat Jun 08 11:41:31 2013 +0400
+++ b/src/if_py_both.h Sat Jun 08 14:40:53 2013 +0400
@@ -5358,6 +5358,7 @@
PyObject *path;
PyObject *pathObject;
PyObject *path_hook;
+ PyObject *attr;
for (i = 0; i < (int)(sizeof(numeric_constants)
/ sizeof(struct numeric_constant));
@@ -5396,14 +5397,26 @@
if (!(py_chdir = PyObject_GetAttrString(other_module, "chdir")))
return -1;
ADD_OBJECT(m, "_chdir", py_chdir);
- if (PyObject_SetAttrString(other_module, "chdir", get_attr(m, "chdir")))
+ if (!(attr = get_attr(m, "chdir")))
return -1;
+ if (PyObject_SetAttrString(other_module, "chdir", attr))
+ {
+ Py_DECREF(attr);
+ return -1;
+ }
+ Py_DECREF(attr);
if ((py_fchdir = PyObject_GetAttrString(other_module, "fchdir")))
{
ADD_OBJECT(m, "_fchdir", py_fchdir);
- if (PyObject_SetAttrString(other_module,"fchdir",get_attr(m,"fchdir")))
+ if (!(attr = get_attr(m, "fchdir")))
return -1;
+ if (PyObject_SetAttrString(other_module, "fchdir", attr))
+ {
+ Py_DECREF(attr);
+ return -1;
+ }
+ Py_DECREF(attr);
}
else
PyErr_Clear();
diff -r 5af09dbe636d -r a40ac5f7feca src/if_python.c
--- a/src/if_python.c Sat Jun 08 11:41:31 2013 +0400
+++ b/src/if_python.c Sat Jun 08 14:40:53 2013 +0400
@@ -207,6 +207,7 @@
# define PyMapping_Check dll_PyMapping_Check
# define PyIter_Next dll_PyIter_Next
# define PyModule_GetDict dll_PyModule_GetDict
+# define PyModule_AddObject dll_PyModule_AddObject
# define PyRun_SimpleString dll_PyRun_SimpleString
# define PyRun_String dll_PyRun_String
# define PyObject_GetAttrString dll_PyObject_GetAttrString
@@ -341,6 +342,7 @@
static int (*dll_PyMapping_Check)(PyObject *);
static PyObject* (*dll_PyIter_Next)(PyObject *);
static PyObject*(*dll_PyModule_GetDict)(PyObject *);
+static int(*dll_PyModule_AddObject)(PyObject *, const char *, PyObject *);
static int(*dll_PyRun_SimpleString)(char *);
static PyObject *(*dll_PyRun_String)(char *, int, PyObject *, PyObject *);
static PyObject* (*dll_PyObject_GetAttrString)(PyObject *, const char *);
@@ -506,6 +508,7 @@
{"PyMapping_Check", (PYTHON_PROC*)&dll_PyMapping_Check},
{"PyIter_Next", (PYTHON_PROC*)&dll_PyIter_Next},
{"PyModule_GetDict", (PYTHON_PROC*)&dll_PyModule_GetDict},
+ {"PyModule_AddObject", (PYTHON_PROC*)&dll_PyModule_AddObject},
{"PyRun_SimpleString", (PYTHON_PROC*)&dll_PyRun_SimpleString},
{"PyRun_String", (PYTHON_PROC*)&dll_PyRun_String},
{"PyObject_GetAttrString", (PYTHON_PROC*)&dll_PyObject_GetAttrString},
@@ -1354,15 +1357,6 @@
#endif
static int
-add_object(PyObject *dict, const char *name, PyObject *object)
-{
- if (PyDict_SetItemString(dict, (char *) name, object))
- return -1;
- Py_DECREF(object);
- return 0;
-}
-
- static int
PythonMod_Init(void)
{
PyObject *mod;
@@ -1379,9 +1373,8 @@
mod = Py_InitModule4("vim", VimMethods, (char *)NULL, (PyObject *)NULL,
PYTHON_API_VERSION);
- dict = PyModule_GetDict(mod);
- return populate_module(dict, add_object, PyDict_GetItemString);
+ return populate_module(mod, PyModule_AddObject, PyObject_GetAttrString);
}
/*************************************************************************
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
diff -cr vim.5af09dbe636d/src/if_py_both.h vim.a40ac5f7feca/src/if_py_both.h
*** vim.5af09dbe636d/src/if_py_both.h 2013-06-09 13:18:43.968236768 +0400
--- vim.a40ac5f7feca/src/if_py_both.h 2013-06-09 13:18:43.980236651 +0400
***************
*** 5358,5363 ****
--- 5358,5364 ----
PyObject *path;
PyObject *pathObject;
PyObject *path_hook;
+ PyObject *attr;
for (i = 0; i < (int)(sizeof(numeric_constants)
/ sizeof(struct numeric_constant));
***************
*** 5396,5409 ****
if (!(py_chdir = PyObject_GetAttrString(other_module, "chdir")))
return -1;
ADD_OBJECT(m, "_chdir", py_chdir);
! if (PyObject_SetAttrString(other_module, "chdir", get_attr(m, "chdir")))
return -1;
if ((py_fchdir = PyObject_GetAttrString(other_module, "fchdir")))
{
ADD_OBJECT(m, "_fchdir", py_fchdir);
! if (PyObject_SetAttrString(other_module,"fchdir",get_attr(m,"fchdir")))
return -1;
}
else
PyErr_Clear();
--- 5397,5422 ----
if (!(py_chdir = PyObject_GetAttrString(other_module, "chdir")))
return -1;
ADD_OBJECT(m, "_chdir", py_chdir);
! if (!(attr = get_attr(m, "chdir")))
return -1;
+ if (PyObject_SetAttrString(other_module, "chdir", attr))
+ {
+ Py_DECREF(attr);
+ return -1;
+ }
+ Py_DECREF(attr);
if ((py_fchdir = PyObject_GetAttrString(other_module, "fchdir")))
{
ADD_OBJECT(m, "_fchdir", py_fchdir);
! if (!(attr = get_attr(m, "fchdir")))
! return -1;
! if (PyObject_SetAttrString(other_module, "fchdir", attr))
! {
! Py_DECREF(attr);
return -1;
+ }
+ Py_DECREF(attr);
}
else
PyErr_Clear();
diff -cr vim.5af09dbe636d/src/if_python.c vim.a40ac5f7feca/src/if_python.c
*** vim.5af09dbe636d/src/if_python.c 2013-06-09 13:18:43.973236719 +0400
--- vim.a40ac5f7feca/src/if_python.c 2013-06-09 13:18:43.984236612 +0400
***************
*** 207,212 ****
--- 207,213 ----
# define PyMapping_Check dll_PyMapping_Check
# define PyIter_Next dll_PyIter_Next
# define PyModule_GetDict dll_PyModule_GetDict
+ # define PyModule_AddObject dll_PyModule_AddObject
# define PyRun_SimpleString dll_PyRun_SimpleString
# define PyRun_String dll_PyRun_String
# define PyObject_GetAttrString dll_PyObject_GetAttrString
***************
*** 341,346 ****
--- 342,348 ----
static int (*dll_PyMapping_Check)(PyObject *);
static PyObject* (*dll_PyIter_Next)(PyObject *);
static PyObject*(*dll_PyModule_GetDict)(PyObject *);
+ static int(*dll_PyModule_AddObject)(PyObject *, const char *, PyObject *);
static int(*dll_PyRun_SimpleString)(char *);
static PyObject *(*dll_PyRun_String)(char *, int, PyObject *, PyObject *);
static PyObject* (*dll_PyObject_GetAttrString)(PyObject *, const char *);
***************
*** 506,511 ****
--- 508,514 ----
{"PyMapping_Check", (PYTHON_PROC*)&dll_PyMapping_Check},
{"PyIter_Next", (PYTHON_PROC*)&dll_PyIter_Next},
{"PyModule_GetDict", (PYTHON_PROC*)&dll_PyModule_GetDict},
+ {"PyModule_AddObject", (PYTHON_PROC*)&dll_PyModule_AddObject},
{"PyRun_SimpleString", (PYTHON_PROC*)&dll_PyRun_SimpleString},
{"PyRun_String", (PYTHON_PROC*)&dll_PyRun_String},
{"PyObject_GetAttrString", (PYTHON_PROC*)&dll_PyObject_GetAttrString},
***************
*** 1354,1368 ****
#endif
static int
- add_object(PyObject *dict, const char *name, PyObject *object)
- {
- if (PyDict_SetItemString(dict, (char *) name, object))
- return -1;
- Py_DECREF(object);
- return 0;
- }
-
- static int
PythonMod_Init(void)
{
PyObject *mod;
--- 1357,1362 ----
***************
*** 1379,1387 ****
mod = Py_InitModule4("vim", VimMethods, (char *)NULL, (PyObject *)NULL,
PYTHON_API_VERSION);
- dict = PyModule_GetDict(mod);
! return populate_module(dict, add_object, PyDict_GetItemString);
}
/*************************************************************************
--- 1373,1380 ----
mod = Py_InitModule4("vim", VimMethods, (char *)NULL, (PyObject *)NULL,
PYTHON_API_VERSION);
! return populate_module(mod, PyModule_AddObject, PyObject_GetAttrString);
}
/*************************************************************************
