mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
patch 8.2.3244: Lua 5.3 print() with a long string crashes
Problem: Lua 5.3 print() with a long string crashes. Solution: Use a growarray instead of a Lua buffer. (Yegappan Lakshmanan, closes #8655)
This commit is contained in:
committed by
Bram Moolenaar
parent
83cd0156e0
commit
41114a2a27
23
src/if_lua.c
23
src/if_lua.c
@@ -1720,11 +1720,12 @@ static const luaL_Reg luaV_Window_mt[] = {
|
|||||||
static int
|
static int
|
||||||
luaV_print(lua_State *L)
|
luaV_print(lua_State *L)
|
||||||
{
|
{
|
||||||
int i, n = lua_gettop(L); // nargs
|
int i, n = lua_gettop(L); // nargs
|
||||||
const char *s;
|
const char *s;
|
||||||
size_t l;
|
size_t l;
|
||||||
luaL_Buffer b;
|
garray_T msg_ga;
|
||||||
luaL_buffinit(L, &b);
|
|
||||||
|
ga_init2(&msg_ga, 1, 128);
|
||||||
lua_getglobal(L, "tostring");
|
lua_getglobal(L, "tostring");
|
||||||
for (i = 1; i <= n; i++)
|
for (i = 1; i <= n; i++)
|
||||||
{
|
{
|
||||||
@@ -1735,13 +1736,19 @@ luaV_print(lua_State *L)
|
|||||||
if (s == NULL)
|
if (s == NULL)
|
||||||
return luaL_error(L, "cannot convert to string");
|
return luaL_error(L, "cannot convert to string");
|
||||||
if (i > 1)
|
if (i > 1)
|
||||||
luaL_addchar(&b, ' '); // use space instead of tab
|
ga_append(&msg_ga, ' '); // use space instead of tab
|
||||||
luaV_addlstring(&b, s, l, 0);
|
ga_concat_len(&msg_ga, (char_u *)s, l);
|
||||||
lua_pop(L, 1);
|
lua_pop(L, 1);
|
||||||
}
|
}
|
||||||
luaL_pushresult(&b);
|
// Replace any "\n" with "\0"
|
||||||
|
for (i = 0; i < msg_ga.ga_len; i++)
|
||||||
|
if (((char *)msg_ga.ga_data)[i] == '\n')
|
||||||
|
((char *)msg_ga.ga_data)[i] = '\0';
|
||||||
|
lua_pushlstring(L, msg_ga.ga_data, msg_ga.ga_len);
|
||||||
if (!got_int)
|
if (!got_int)
|
||||||
luaV_msg(L);
|
luaV_msg(L);
|
||||||
|
|
||||||
|
ga_clear(&msg_ga);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
16
src/misc2.c
16
src/misc2.c
@@ -1565,6 +1565,22 @@ ga_concat(garray_T *gap, char_u *s)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Concatenate 'len' bytes from string 's' to a growarray.
|
||||||
|
* When "s" is NULL does not do anything.
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
ga_concat_len(garray_T *gap, char_u *s, size_t len)
|
||||||
|
{
|
||||||
|
if (s == NULL || *s == NUL)
|
||||||
|
return;
|
||||||
|
if (ga_grow(gap, len) == OK)
|
||||||
|
{
|
||||||
|
mch_memmove((char *)gap->ga_data + gap->ga_len, s, (size_t)len);
|
||||||
|
gap->ga_len += len;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Append one byte to a growarray which contains bytes.
|
* Append one byte to a growarray which contains bytes.
|
||||||
*/
|
*/
|
||||||
|
@@ -45,6 +45,7 @@ int ga_grow_inner(garray_T *gap, int n);
|
|||||||
char_u *ga_concat_strings(garray_T *gap, char *sep);
|
char_u *ga_concat_strings(garray_T *gap, char *sep);
|
||||||
int ga_add_string(garray_T *gap, char_u *p);
|
int ga_add_string(garray_T *gap, char_u *p);
|
||||||
void ga_concat(garray_T *gap, char_u *s);
|
void ga_concat(garray_T *gap, char_u *s);
|
||||||
|
void ga_concat_len(garray_T *gap, char_u *s, size_t len);
|
||||||
void ga_append(garray_T *gap, int c);
|
void ga_append(garray_T *gap, int c);
|
||||||
void append_ga_line(garray_T *gap);
|
void append_ga_line(garray_T *gap);
|
||||||
int simplify_key(int key, int *modifiers);
|
int simplify_key(int key, int *modifiers);
|
||||||
|
@@ -755,6 +755,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 */
|
||||||
|
/**/
|
||||||
|
3244,
|
||||||
/**/
|
/**/
|
||||||
3243,
|
3243,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user