mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 11:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

*: Fix memory leaks found by clang sanitizer

Browse Source
This commit is contained in:
ZyX
2016-02-06 22:19:23 +03:00
parent d4106f6df3
commit 7124329bd9
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -552,6 +552,7 @@ json_decode_string_cycle_start:
clear_tv(&obj); clear_tv(&obj);
goto json_decode_string_fail; goto json_decode_string_fail;
} }
xfree(str);
POP(obj, true); POP(obj, true);
} else { } else {
*str_end = NUL; *str_end = NUL;

10
src/nvim/eval/encode.c
View File

@@ -613,7 +613,7 @@ scope int encode_vim_to_##name(firstargtype firstargname, typval_T *const tv, \
CONV_DICT_BETWEEN_ITEMS(); \ CONV_DICT_BETWEEN_ITEMS(); \
} \ } \
const list_T *const kv_pair = cur_mpsv->data.l.li->li_tv.vval.v_list; \ const list_T *const kv_pair = cur_mpsv->data.l.li->li_tv.vval.v_list; \
CONV_SPECIAL_DICT_KEY_CHECK(kv_pair); \ CONV_SPECIAL_DICT_KEY_CHECK(name, kv_pair); \
if (name##_convert_one_value(firstargname, &mpstack, \ if (name##_convert_one_value(firstargname, &mpstack, \
&kv_pair->lv_first->li_tv, copyID, \ &kv_pair->lv_first->li_tv, copyID, \
objname) == FAIL) { \ objname) == FAIL) { \
@@ -735,7 +735,7 @@ encode_vim_to_##name##_error_ret: \
#define CONV_DICT_BETWEEN_ITEMS() \ #define CONV_DICT_BETWEEN_ITEMS() \
ga_concat(gap, ", ") ga_concat(gap, ", ")
#define CONV_SPECIAL_DICT_KEY_CHECK(kv_pair) #define CONV_SPECIAL_DICT_KEY_CHECK(name, kv_pair)
#define CONV_LIST_END(lst) \ #define CONV_LIST_END(lst) \
ga_append(gap, ']') ga_append(gap, ']')
@@ -1058,11 +1058,11 @@ static inline bool check_json_key(const typval_T *const tv)
} }
#undef CONV_SPECIAL_DICT_KEY_CHECK #undef CONV_SPECIAL_DICT_KEY_CHECK
#define CONV_SPECIAL_DICT_KEY_CHECK(kv_pair) \ #define CONV_SPECIAL_DICT_KEY_CHECK(name, kv_pair) \
do { \ do { \
if (!check_json_key(&kv_pair->lv_first->li_tv)) { \ if (!check_json_key(&kv_pair->lv_first->li_tv)) { \
EMSG(_("E474: Invalid key in special dictionary")); \ EMSG(_("E474: Invalid key in special dictionary")); \
return FAIL; \ goto encode_vim_to_##name##_error_ret; \
} \ } \
} while (0) } while (0)
@@ -1235,7 +1235,7 @@ char *encode_tv2json(typval_T *tv, size_t *len)
#define CONV_DICT_BETWEEN_ITEMS() #define CONV_DICT_BETWEEN_ITEMS()
#define CONV_SPECIAL_DICT_KEY_CHECK(kv_pair) #define CONV_SPECIAL_DICT_KEY_CHECK(name, kv_pair)
#define CONV_LIST_END(lst) #define CONV_LIST_END(lst)