aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval/typval.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-12-11 23:36:15 -0500
committerGitHub <noreply@github.com>2020-12-11 23:36:15 -0500
commitcacdef5ff18e7123a9e734537a831839bf4ef0ec (patch)
tree5d4f1683e7678c1ba339992438def2a16e59adb9 /src/nvim/eval/typval.c
parent062576f679a1bd5cb546bb8081dc97caefe7b51f (diff)
parentda58242fb8e432415778e3eeab96a9d63edfdf06 (diff)
downloadrneovim-cacdef5ff18e7123a9e734537a831839bf4ef0ec.tar.gz
rneovim-cacdef5ff18e7123a9e734537a831839bf4ef0ec.tar.bz2
rneovim-cacdef5ff18e7123a9e734537a831839bf4ef0ec.zip
Merge pull request #13489 from janlazo/issue-13485
eval: executable(), exepath() accept strings only
Diffstat (limited to 'src/nvim/eval/typval.c')
-rw-r--r--src/nvim/eval/typval.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
index b62820fecc..02d32a4f86 100644
--- a/src/nvim/eval/typval.c
+++ b/src/nvim/eval/typval.c
@@ -2953,6 +2953,19 @@ 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.
+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) {
+ EMSG(_(e_stringreq));
+ return FAIL;
+ }
+ return OK;
+}
+
/// Get the string value of a "stringish" VimL object.
///
/// @param[in] tv Object to get value of.