patch 8.1.1021: pyeval() and py3eval() leak memory
Problem: pyeval() and py3eval() leak memory.
Solution: Do not increase the reference count twice. (Ozaki Kiichi,
closes #4129)
diff --git a/src/if_python3.c b/src/if_python3.c
index 8b1b5be..e8ab44f 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -1663,35 +1663,21 @@
}
void
-do_py3eval (char_u *str, typval_T *rettv)
+do_py3eval(char_u *str, typval_T *rettv)
{
DoPyCommand((char *) str,
(rangeinitializer) init_range_eval,
(runner) run_eval,
(void *) rettv);
- switch(rettv->v_type)
+ if (rettv->v_type == VAR_UNKNOWN)
{
- case VAR_DICT: ++rettv->vval.v_dict->dv_refcount; break;
- case VAR_LIST: ++rettv->vval.v_list->lv_refcount; break;
- case VAR_FUNC: func_ref(rettv->vval.v_string); break;
- case VAR_PARTIAL: ++rettv->vval.v_partial->pt_refcount; break;
- case VAR_UNKNOWN:
- rettv->v_type = VAR_NUMBER;
- rettv->vval.v_number = 0;
- break;
- case VAR_NUMBER:
- case VAR_STRING:
- case VAR_FLOAT:
- case VAR_SPECIAL:
- case VAR_JOB:
- case VAR_CHANNEL:
- case VAR_BLOB:
- break;
+ rettv->v_type = VAR_NUMBER;
+ rettv->vval.v_number = 0;
}
}
int
-set_ref_in_python3 (int copyID)
+set_ref_in_python3(int copyID)
{
return set_ref_in_py(copyID);
}