updated for version 7.3.407
Problem: ":12verbose call F()" may duplicate text while trying to truncate.
(Thinca)
Solution: Only truncate when there is not enough room. Also check the byte
length of the buffer.
diff --git a/src/eval.c b/src/eval.c
index 16e740f..dd16851 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -22163,8 +22163,12 @@
s = tv2string(&argvars[i], &tofree, numbuf2, 0);
if (s != NULL)
{
- trunc_string(s, buf, MSG_BUF_CLEN);
- msg_puts(buf);
+ if (vim_strsize(s) > MSG_BUF_CLEN)
+ {
+ trunc_string(s, buf, MSG_BUF_CLEN, MSG_BUF_LEN);
+ s = buf;
+ }
+ msg_puts(s);
vim_free(tofree);
}
}
@@ -22252,8 +22256,12 @@
s = tv2string(fc->rettv, &tofree, numbuf2, 0);
if (s != NULL)
{
- trunc_string(s, buf, MSG_BUF_CLEN);
- smsg((char_u *)_("%s returning %s"), sourcing_name, buf);
+ if (vim_strsize(s) > MSG_BUF_CLEN)
+ {
+ trunc_string(s, buf, MSG_BUF_CLEN, MSG_BUF_LEN);
+ s = buf;
+ }
+ smsg((char_u *)_("%s returning %s"), sourcing_name, s);
vim_free(tofree);
}
}