diff options
| author | ZyX <kp-pav@yandex.ru> | 2016-04-18 15:55:51 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2016-06-24 16:53:26 +0300 |
| commit | da15b5c1f3230b127ebdbe52d449d1ee8104b2ae (patch) | |
| tree | c6b432e23f07e456826c9f7d99104fc1da2defcc /src/nvim/eval/encode.c | |
| parent | 47a15d0256170e9ce33cda23d8f0b39451fa7129 (diff) | |
| download | rneovim-da15b5c1f3230b127ebdbe52d449d1ee8104b2ae.tar.gz rneovim-da15b5c1f3230b127ebdbe52d449d1ee8104b2ae.tar.bz2 rneovim-da15b5c1f3230b127ebdbe52d449d1ee8104b2ae.zip | |
api/helpers: Use typval_encode.h for vim_to_object
This ought to prevent stack overflow, but I do not see this actually working:
*lua* code crashes with stack overflow when trying to deserialize msgpack from
Neovim, Neovim is fine even if nesting level is increased 100x (though test
becomes very slow); not sure how recursive function may survive this. So it
looks like there are currently only two positive effects:
1. NULL lists are returned as empty (#4596).
2. Functional tests are slightly more fast. Very slightly. Checked for Release
build for test/functional/eval tests because benchmarking of debug mode is
not very useful.
Diffstat (limited to 'src/nvim/eval/encode.c')
| -rw-r--r-- | src/nvim/eval/encode.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/nvim/eval/encode.c b/src/nvim/eval/encode.c index 54daf7557e..771655fee5 100644 --- a/src/nvim/eval/encode.c +++ b/src/nvim/eval/encode.c @@ -379,7 +379,6 @@ int encode_read_from_list(ListReaderState *const state, char *const buf, } \ vim_snprintf(ebuf, ARRAY_SIZE(ebuf), "{E724@%zu}", backref); \ ga_concat(gap, &ebuf[0]); \ - return OK; \ } while (0) #define TYPVAL_ENCODE_ALLOW_SPECIALS false @@ -426,7 +425,6 @@ TYPVAL_ENCODE_DEFINE_CONV_FUNCTIONS(, echo, garray_T *const, gap) EMSG(_("E724: unable to correctly dump variable " \ "with self-referencing container")); \ } \ - return OK; \ } while (0) #undef TYPVAL_ENCODE_ALLOW_SPECIALS @@ -662,9 +660,8 @@ static inline int convert_to_json_string(garray_T *const gap, /// Check whether given key can be used in json_encode() /// /// @param[in] tv Key to check. -static inline bool check_json_key(const typval_T *const tv) +bool encode_check_json_key(const typval_T *const tv) FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_PURE - FUNC_ATTR_ALWAYS_INLINE { if (tv->v_type == VAR_STRING) { return true; @@ -701,7 +698,7 @@ static inline bool check_json_key(const typval_T *const tv) #undef TYPVAL_ENCODE_CONV_SPECIAL_DICT_KEY_CHECK #define TYPVAL_ENCODE_CONV_SPECIAL_DICT_KEY_CHECK(label, kv_pair) \ do { \ - if (!check_json_key(&kv_pair->lv_first->li_tv)) { \ + if (!encode_check_json_key(&kv_pair->lv_first->li_tv)) { \ EMSG(_("E474: Invalid key in special dictionary")); \ goto label; \ } \ |