patch 9.1.0429: Coverity complains about eval.c refactor
Commit:
https://github.com/vim/vim/commit/b335a9312cfbe5a5fa9186d06fe10479502ba15c
Author: Christian Brabandt <[email protected]>
Date: Tue May 21 18:39:10 2024 +0200
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 <[email protected]>
diff --git a/src/eval.c b/src/eval.c
index 833a230f9..9a2064553 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -6499,7 +6499,7 @@ func_tv2string(typval_T *tv, char_u **tofree, int
echo_style)
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 @@ list_tv2string(
}
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 @@ dict_tv2string(
}
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);
diff --git a/src/version.c b/src/version.c
index acec967b8..b2f04169f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 429,
/**/
428,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1s9Sbm-00Fs8u-Pt%40256bit.org.
