summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-04-24 13:10:41 +0200
committerBram Moolenaar <Bram@vim.org>2013-04-24 13:10:41 +0200
commit7a26dd860a1c666233574edc1b96f721f214067f (patch)
tree81004ad0a9446d0a6b7427ac12d0fb24d7ac289c
parentaf6abb9d93959d801d40a2d77a96962cef2335fc (diff)
downloadvim-7a26dd860a1c666233574edc1b96f721f214067f.zip
updated for version 7.3.908
Problem: Possible crash when using a list in Python. Solution: Return early if the list is NULL. (ZyX)
-rw-r--r--src/if_py_both.h2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h
index cd8080041..2739f6660 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -738,6 +738,8 @@ pymap_to_tv(PyObject *obj, typval_T *tv, PyObject *lookupDict)
tv->vval.v_dict = d;
list = PyMapping_Items(obj);
+ if (list == NULL)
+ return -1;
lsize = PyList_Size(list);
while (lsize--)
{
diff --git a/src/version.c b/src/version.c
index 1aeeb5621..4e0a6a1b5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 908,
+/**/
907,
/**/
906,