From 24922ec23360e7ea7c5a803c9edf476bb6395b32 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 23 Feb 2017 17:59:22 +0100 Subject: 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 #1465) --- src/misc2.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/misc2.c') diff --git a/src/misc2.c b/src/misc2.c index 71ca6d8f5..992e5c292 100644 --- 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. -- cgit v1.2.1