From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 7 Dec 2013 13:28:43 +0000 (+0100)
Subject: updated for version 7.4.111
X-Git-Tag: v7.4.111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2401d62e0f8de45598c8ed7d9e9b09227f6682d;p=vim

updated for version 7.4.111
Problem:    Memory leak in Python OptionsAssItem. (Ken Takata)
Solution:   Call Py_XDECREF() where needed. (ZyX)
---

diff --git a/src/if_py_both.h b/src/if_py_both.h
index a8188c16f..5a49d1e9e 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 4a4bcd0a2..5ec247874 100644
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    111,
 /**/
     110,
 /**/