mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-20 02:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

eval/decode: Fix memory leak in JSON functions

Browse Source
This commit is contained in:
ZyX
2017-01-21 00:16:25 +03:00
parent a3ea05c1e5
commit 45feaa73d0
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/nvim/eval/decode.c
View File

@@ -249,10 +249,14 @@ list_T *decode_create_map_special_dict(typval_T *const ret_tv)
/// determined. /// determined.
/// @param[in] binary If true, save special string type as kMPBinary, /// @param[in] binary If true, save special string type as kMPBinary,
/// otherwise kMPString. /// otherwise kMPString.
/// @param[in] s_allocated If true, then `s` was allocated and can be saved in
/// a returned structure. If it is not saved there, it
/// will be freed.
/// ///
/// @return Decoded string. /// @return Decoded string.
typval_T decode_string(const char *const s, const size_t len, typval_T decode_string(const char *const s, const size_t len,
const TriState hasnul, const bool binary) const TriState hasnul, const bool binary,
const bool s_allocated)
FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_WARN_UNUSED_RESULT
{ {
assert(s != NULL || len == 0); assert(s != NULL || len == 0);
@@ -268,7 +272,11 @@ typval_T decode_string(const char *const s, const size_t len,
.v_lock = VAR_UNLOCKED, .v_lock = VAR_UNLOCKED,
.vval = { .v_list = list }, .vval = { .v_list = list },
})); }));
if (encode_list_write((void *)list, s, len) == -1) { const int elw_ret = encode_list_write((void *)list, s, len);
if (s_allocated) {
xfree((void *)s);
}
if (elw_ret == -1) {
clear_tv(&tv); clear_tv(&tv);
return (typval_T) { .v_type = VAR_UNKNOWN, .v_lock = VAR_UNLOCKED }; return (typval_T) { .v_type = VAR_UNKNOWN, .v_lock = VAR_UNLOCKED };
} }
@@ -277,7 +285,8 @@ typval_T decode_string(const char *const s, const size_t len,
return (typval_T) { return (typval_T) {
.v_type = VAR_STRING, .v_type = VAR_STRING,
.v_lock = VAR_UNLOCKED, .v_lock = VAR_UNLOCKED,
.vval = { .v_string = xmemdupz(s, len) }, .vval = { .v_string = (char_u *)(
s_allocated ? (char *)s : xmemdupz(s, len)) },
}; };
} }
} }
@@ -492,9 +501,10 @@ static inline int parse_json_string(vimconv_T *const conv,
str = new_str; str = new_str;
str_end = new_str + str_len; str_end = new_str + str_len;
} }
*str_end = NUL;
typval_T obj; typval_T obj;
obj = decode_string(str, (size_t)(str_end - str), hasnul ? kTrue : kFalse, obj = decode_string(str, (size_t)(str_end - str), hasnul ? kTrue : kFalse,
false); false, true);
if (obj.v_type == VAR_UNKNOWN) { if (obj.v_type == VAR_UNKNOWN) {
goto parse_json_string_fail; goto parse_json_string_fail;
} }
@@ -1022,14 +1032,16 @@ int msgpack_to_vim(const msgpack_object mobj, typval_T *const rettv)
break; break;
} }
case MSGPACK_OBJECT_STR: { case MSGPACK_OBJECT_STR: {
*rettv = decode_string(mobj.via.bin.ptr, mobj.via.bin.size, kTrue, false); *rettv = decode_string(mobj.via.bin.ptr, mobj.via.bin.size, kTrue, false,
false);
if (rettv->v_type == VAR_UNKNOWN) { if (rettv->v_type == VAR_UNKNOWN) {
return FAIL; return FAIL;
} }
break; break;
} }
case MSGPACK_OBJECT_BIN: { case MSGPACK_OBJECT_BIN: {
*rettv = decode_string(mobj.via.bin.ptr, mobj.via.bin.size, kNone, true); *rettv = decode_string(mobj.via.bin.ptr, mobj.via.bin.size, kNone, true,
false);
if (rettv->v_type == VAR_UNKNOWN) { if (rettv->v_type == VAR_UNKNOWN) {
return FAIL; return FAIL;
} }

4
src/nvim/viml/executor/converter.c
View File

@@ -210,7 +210,7 @@ bool nlua_pop_typval(lua_State *lstate, typval_T *ret_tv)
list_T *const kv_pair = list_alloc(); list_T *const kv_pair = list_alloc();
list_append_list(cur.tv->vval.v_list, kv_pair); list_append_list(cur.tv->vval.v_list, kv_pair);
listitem_T *const key = listitem_alloc(); listitem_T *const key = listitem_alloc();
key->li_tv = decode_string(s, len, kTrue, false); key->li_tv = decode_string(s, len, kTrue, false, false);
list_append(kv_pair, key); list_append(kv_pair, key);
if (key->li_tv.v_type == VAR_UNKNOWN) { if (key->li_tv.v_type == VAR_UNKNOWN) {
ret = false; ret = false;
@@ -268,7 +268,7 @@ bool nlua_pop_typval(lua_State *lstate, typval_T *ret_tv)
case LUA_TSTRING: { case LUA_TSTRING: {
size_t len; size_t len;
const char *s = lua_tolstring(lstate, -1, &len); const char *s = lua_tolstring(lstate, -1, &len);
*cur.tv = decode_string(s, len, kNone, true); *cur.tv = decode_string(s, len, kNone, true, false);
if (cur.tv->v_type == VAR_UNKNOWN) { if (cur.tv->v_type == VAR_UNKNOWN) {
ret = false; ret = false;
} }