diff options
| -rw-r--r-- | src/nvim/eval.c | 22 | ||||
| -rw-r--r-- | src/nvim/eval/typval.c | 2 |
2 files changed, 19 insertions, 5 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index f5f9c4f77b..206ff93dfe 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -7523,16 +7523,30 @@ int check_luafunc_name(const char *const str, const bool paren) /// "index" is out of range NULL is returned. char *char_from_string(const char *str, varnumber_T index) { - size_t nbyte = 0; varnumber_T nchar = index; - if (str == NULL || index < 0) { + if (str == NULL) { return NULL; } size_t slen = strlen(str); - while (nchar > 0 && nbyte < slen) { + + // do the same as for a list: a negative index counts from the end + if (index < 0) { + int clen = 0; + + for (size_t nbyte = 0; nbyte < slen; clen++) { + nbyte += (size_t)utf_ptr2len(str + nbyte); + } + nchar = clen + index; + if (nchar < 0) { + // unlike list: index out of range results in empty string + return NULL; + } + } + + size_t nbyte = 0; + for (; nchar > 0 && nbyte < slen; nchar--) { nbyte += (size_t)utf_ptr2len(str + nbyte); - nchar--; } if (nbyte >= slen) { return NULL; diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c index 9328f53dbd..eb8c89c36e 100644 --- a/src/nvim/eval/typval.c +++ b/src/nvim/eval/typval.c @@ -859,7 +859,7 @@ int tv_list_slice_or_index(list_T *list, bool range, varnumber_T n1_arg, varnumb // A list index out of range is an error. if (!range) { if (verbose) { - semsg(_(e_list_index_out_of_range_nr), (int64_t)n1); + semsg(_(e_list_index_out_of_range_nr), (int64_t)n1_arg); } return FAIL; } |