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

fix(eval): checking for a non-empty string is too strict (#15987)

Browse Source 
Cherry-pick check_for_nonempty_string() from patch vim-8.2.2133 and
apply it on the bases of https://github.com/neovim/neovim/pull/13489

2a9d5d386b
This commit is contained in:
Fabian
2021-10-29 04:13:40 +02:00
committed by GitHub
parent bb79e05f81
commit 1dbbaf89bf
6 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3146,19 +3146,31 @@ float_T tv_get_float(const typval_T *const tv)
return 0;
}
// Give an error and return FAIL unless "tv" is a non-empty string.
// Give an error and return FAIL unless "tv" is a string.
int tv_check_for_string(const typval_T *const tv)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_PURE
{
if (tv->v_type != VAR_STRING
|| tv->vval.v_string == NULL
|| *tv->vval.v_string == NUL) {
if (tv->v_type != VAR_STRING) {
EMSG(_(e_stringreq));
return FAIL;
}
return OK;
}
// Give an error and return FAIL unless "tv" is a non-empty string.
int tv_check_for_nonempty_string(const typval_T *const tv)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_PURE
{
if (tv_check_for_string(tv) == FAIL) {
return FAIL;
}
if (tv->vval.v_string == NULL || *tv->vval.v_string == NUL) {
EMSG(_(e_non_empty_string_required));
return FAIL;
}
return OK;
}
/// Get the string value of a "stringish" VimL object.
///
/// @param[in] tv Object to get value of.