summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-06-29 23:07:44 +0200
committerBram Moolenaar <Bram@vim.org>2020-06-29 23:07:44 +0200
commitde19b745eee06a8a204988ae9989d97143caece9 (patch)
treec2c3333817621f793199120b6e40f67602b674e0
parentcf070112ca2a6ac9ec5466be1cdc667f6abe8fd0 (diff)
downloadvim-git-8.2.1093.tar.gz
patch 8.2.1093: Python: double free when adding item to dict failsv8.2.1093
Problem: Python: double free when adding item to dict fails. Solution: Remove vim_free() call.
-rw-r--r--src/if_py_both.h1
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h
index e262d1f75..44b4baffe 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -1913,7 +1913,6 @@ DictionaryAssItem(
if (dict_add(dict, di) == FAIL)
{
- vim_free(di);
dictitem_free(di);
RAISE_KEY_ADD_FAIL(key);
Py_XDECREF(todecref);
diff --git a/src/version.c b/src/version.c
index cac669e42..369724830 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1093,
+/**/
1092,
/**/
1091,