forked from aniani/vim
patch 8.2.2515: memory access error when truncating an empty message
Problem: Memory access error when truncating an empty message. Solution: Check for an empty string. (Dominique Pellé, closes #7841)
This commit is contained in:
@@ -248,6 +248,13 @@ trunc_string(
|
|||||||
int i;
|
int i;
|
||||||
int n;
|
int n;
|
||||||
|
|
||||||
|
if (*s == NUL)
|
||||||
|
{
|
||||||
|
if (buflen > 0)
|
||||||
|
*buf = NUL;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (room_in < 3)
|
if (room_in < 3)
|
||||||
room = 0;
|
room = 0;
|
||||||
half = room / 2;
|
half = room / 2;
|
||||||
|
@@ -49,6 +49,15 @@ test_trunc_string(void)
|
|||||||
char_u *buf; /*allocated every time to find uninit errors */
|
char_u *buf; /*allocated every time to find uninit errors */
|
||||||
char_u *s;
|
char_u *s;
|
||||||
|
|
||||||
|
// Should not write anything to destination if buflen is 0.
|
||||||
|
trunc_string((char_u *)"", NULL, 1, 0);
|
||||||
|
|
||||||
|
// Truncating an empty string does nothing.
|
||||||
|
buf = alloc(1);
|
||||||
|
trunc_string((char_u *)"", buf, 1, 1);
|
||||||
|
assert(buf[0] == NUL);
|
||||||
|
vim_free(buf);
|
||||||
|
|
||||||
// in place
|
// in place
|
||||||
buf = alloc(40);
|
buf = alloc(40);
|
||||||
STRCPY(buf, "text");
|
STRCPY(buf, "text");
|
||||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
2515,
|
||||||
/**/
|
/**/
|
||||||
2514,
|
2514,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user