diff src/misc2.c @ 10936:a516b6c279d9 v8.0.0357

patch 8.0.0357: crash when setting 'guicursor' to weird value commit https://github.com/vim/vim/commit/24922ec23360e7ea7c5a803c9edf476bb6395b32 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Feb 23 17:59:22 2017 +0100 patch 8.0.0357: crash when setting 'guicursor' to weird value Problem: Crash when setting 'guicursor' to weird value. Solution: Avoid negative size. (Dominique Pelle, closes https://github.com/vim/vim/issues/1465)
author Christian Brabandt <cb@256bit.org>
date Thu, 23 Feb 2017 18:00:05 +0100
parents 905ab712979c
children 4e7308525fe7
line wrap: on
line diff
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -3472,11 +3472,12 @@ parse_shape_opt(int what)
 	while (*modep != NUL)
 	{
 	    colonp = vim_strchr(modep, ':');
-	    if (colonp == NULL)
+	    commap = vim_strchr(modep, ',');
+
+	    if (colonp == NULL || (commap != NULL && commap < colonp))
 		return (char_u *)N_("E545: Missing colon");
 	    if (colonp == modep)
 		return (char_u *)N_("E546: Illegal mode");
-	    commap = vim_strchr(modep, ',');
 
 	    /*
 	     * Repeat for all mode's before the colon.