patch 9.1.0429: Coverity complains about eval.c refactor
Problem: Coverity complains about eval.c refactor
(after v9.1.0422)
Solution: Check that buf is not used un-initialized,
add explicit conditions for save and restore
of copyID
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/eval.c b/src/eval.c
index 833a230..9a20645 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -6499,7 +6499,7 @@
r = tv->vval.v_string == NULL ? (char_u *)"function()"
: make_ufunc_name_readable(tv->vval.v_string,
buf, MAX_FUNC_NAME_LEN);
- if (r == buf)
+ if (r == buf && tv->vval.v_string != NULL)
{
r = vim_strsave(buf);
*tofree = r;
@@ -6616,7 +6616,9 @@
}
else
{
- int old_copyID = tv->vval.v_list->lv_copyID;
+ int old_copyID;
+ if (restore_copyID)
+ old_copyID = tv->vval.v_list->lv_copyID;
tv->vval.v_list->lv_copyID = copyID;
*tofree = list2string(tv, copyID, restore_copyID);
@@ -6658,7 +6660,9 @@
}
else
{
- int old_copyID = tv->vval.v_dict->dv_copyID;
+ int old_copyID;
+ if (restore_copyID)
+ old_copyID = tv->vval.v_dict->dv_copyID;
tv->vval.v_dict->dv_copyID = copyID;
*tofree = dict2string(tv, copyID, restore_copyID);