summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-12-07 14:28:43 +0100
committerBram Moolenaar <bram@vim.org>2013-12-07 14:28:43 +0100
commitf5b7fab79d63931e4c0322f0a6b7d65cc131085d (patch)
tree383d1e60d94343a5c5b3db9c05ecb4a56c9ef216
parentaf2f9548ca7180e85f96815d61ab02a36f24786f (diff)
downloadvim-f5b7fab79d63931e4c0322f0a6b7d65cc131085d.tar.gz
updated for version 7.4.111v7.4.111v7-4-111
Problem: Memory leak in Python OptionsAssItem. (Ken Takata) Solution: Call Py_XDECREF() where needed. (ZyX)
-rw-r--r--src/if_py_both.h7
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h
index a8188c16..5a49d1e9 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -3005,11 +3005,14 @@ OptionsAssItem(OptionsObject *self, PyObject *keyObject, PyObject *valObject)
else
{
char_u *val;
- PyObject *todecref;
+ PyObject *todecref2;
- if ((val = StringToChars(valObject, &todecref)))
+ if ((val = StringToChars(valObject, &todecref2)))
+ {
ret = set_option_value_for(key, 0, val, opt_flags,
self->opt_type, self->from);
+ Py_XDECREF(todecref2);
+ }
else
ret = -1;
}
diff --git a/src/version.c b/src/version.c
index 4a4bcd0a..5ec24787 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 111,
+/**/
110,
/**/
109,