patch 8.1.0229: crash when dumping profiling data
Problem: Crash when dumping profiling data.
Solution: Reset flag indicating that initialization was done.
diff --git a/src/userfunc.c b/src/userfunc.c
index 80a603b..a8ea303 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -1102,6 +1102,21 @@
return FALSE;
}
+ static void
+func_clear_items(ufunc_T *fp)
+{
+ ga_clear_strings(&(fp->uf_args));
+ ga_clear_strings(&(fp->uf_lines));
+#ifdef FEAT_PROFILE
+ vim_free(fp->uf_tml_count);
+ fp->uf_tml_count = NULL;
+ vim_free(fp->uf_tml_total);
+ fp->uf_tml_total = NULL;
+ vim_free(fp->uf_tml_self);
+ fp->uf_tml_self = NULL;
+#endif
+}
+
/*
* Free all things that a function contains. Does not free the function
* itself, use func_free() for that.
@@ -1115,13 +1130,7 @@
fp->uf_cleared = TRUE;
/* clear this function */
- ga_clear_strings(&(fp->uf_args));
- ga_clear_strings(&(fp->uf_lines));
-#ifdef FEAT_PROFILE
- vim_free(fp->uf_tml_count);
- vim_free(fp->uf_tml_total);
- vim_free(fp->uf_tml_self);
-#endif
+ func_clear_items(fp);
funccal_unref(fp->uf_scoped, fp, force);
}
@@ -2312,9 +2321,12 @@
else
{
/* redefine existing function */
- ga_clear_strings(&(fp->uf_args));
- ga_clear_strings(&(fp->uf_lines));
VIM_CLEAR(name);
+ func_clear_items(fp);
+#ifdef FEAT_PROFILE
+ fp->uf_profiling = FALSE;
+ fp->uf_prof_initialized = FALSE;
+#endif
}
}
}
@@ -2434,10 +2446,6 @@
fp->uf_scoped = NULL;
#ifdef FEAT_PROFILE
- fp->uf_tml_count = NULL;
- fp->uf_tml_total = NULL;
- fp->uf_tml_self = NULL;
- fp->uf_profiling = FALSE;
if (prof_def_func())
func_do_profile(fp);
#endif
diff --git a/src/version.c b/src/version.c
index 8b31adb..5f7d908 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 229,
+/**/
228,
/**/
227,