mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-04 00:46:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

typval: fix incompatibility with vim

Browse Source 
The dict_add_string of vim accepts NULL as the value to add. But
tv_dict_add_str didn't accept it. Change it to accept NULL as well as vim.
This commit is contained in:
erw7
2020-07-23 12:58:22 +09:00
parent 326b87feb6
commit e0afec8a62
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1779,9 +1779,9 @@ int tv_dict_add_bool(dict_T *const d, const char *const key,
int tv_dict_add_str(dict_T *const d, int tv_dict_add_str(dict_T *const d,
const char *const key, const size_t key_len, const char *const key, const size_t key_len,
const char *const val) const char *const val)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ARG(1, 2)
{ {
return tv_dict_add_allocated_str(d, key, key_len, xstrdup(val)); return tv_dict_add_str_len(d, key, key_len, val, -1);
} }
/// Add a string entry to dictionary /// Add a string entry to dictionary
@@ -1795,10 +1795,10 @@ int tv_dict_add_str(dict_T *const d,
/// @return OK in case of success, FAIL when key already exists. /// @return OK in case of success, FAIL when key already exists.
int tv_dict_add_str_len(dict_T *const d, int tv_dict_add_str_len(dict_T *const d,
const char *const key, const size_t key_len, const char *const key, const size_t key_len,
char *const val, int len) const char *const val, int len)
FUNC_ATTR_NONNULL_ARG(1, 2) FUNC_ATTR_NONNULL_ARG(1, 2)
{ {
char *s = val ? val : ""; char *s = NULL;
if (val != NULL) { if (val != NULL) {
s = (len < 0) ? xstrdup(val) : xstrndup(val, (size_t)len); s = (len < 0) ? xstrdup(val) : xstrndup(val, (size_t)len);
} }
@@ -1821,7 +1821,7 @@ int tv_dict_add_str_len(dict_T *const d,
int tv_dict_add_allocated_str(dict_T *const d, int tv_dict_add_allocated_str(dict_T *const d,
const char *const key, const size_t key_len, const char *const key, const size_t key_len,
char *const val) char *const val)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ARG(1, 2)
{ {
dictitem_T *const item = tv_dict_item_alloc_len(key, key_len); dictitem_T *const item = tv_dict_item_alloc_len(key, key_len);