diff src/evalfunc.c @ 13070:17720967656c v8.0.1410

patch 8.0.1410: hang when using count() with an empty string commit https://github.com/vim/vim/commit/338e47fdfdf0d918dae50a5cbf0cf4f7be45b4f0 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Dec 19 11:55:26 2017 +0100 patch 8.0.1410: hang when using count() with an empty string Problem: Hang when using count() with an empty string. Solution: Return zero for an empty string. (Dominique Pelle, closes https://github.com/vim/vim/issues/2465)
author Christian Brabandt <cb@256bit.org>
date Tue, 19 Dec 2017 12:00:05 +0100
parents 58cce40c965b
children 3dd37eec73f0
line wrap: on
line diff
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -2382,7 +2382,7 @@ f_count(typval_T *argvars, typval_T *ret
 	char_u *p = argvars[0].vval.v_string;
 	char_u *next;
 
-	if (!error && expr != NULL && p != NULL)
+	if (!error && expr != NULL && *expr != NUL && p != NULL)
 	{
 	    if (ic)
 	    {