changeset 19227:9b97da610cab v8.2.0172

patch 8.2.0172: Coverity warning for not restoring character Commit: https://github.com/vim/vim/commit/4549ece47cc8d6487d8e64ae37361fea87e3ad39 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jan 28 23:13:42 2020 +0100 patch 8.2.0172: Coverity warning for not restoring character Problem: Coverity warning for not restoring character. Solution: Restore the character also in case of failure.
author Bram Moolenaar <Bram@vim.org>
date Tue, 28 Jan 2020 23:15:05 +0100
parents 17838f264b53
children 6db2a20db2c3
files src/version.c src/vim9script.c
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    172,
+/**/
     171,
 /**/
     170,
--- a/src/vim9script.c
+++ b/src/vim9script.c
@@ -358,15 +358,14 @@ handle_import(char_u *arg_start, garray_
 		}
 		sv = NULL;
 	    }
+	    *arg = cc;
+	    arg = skipwhite(arg);
 
 	    imported = new_imported(gap != NULL ? gap
 				       : &SCRIPT_ITEM(import_sid)->sn_imports);
 	    if (imported == NULL)
 		return NULL;
 
-	    *arg = cc;
-	    arg = skipwhite(arg);
-
 	    // TODO: check for "as" following
 	    // imported->imp_name = vim_strnsave(as_ptr, as_len);
 	    imported->imp_name = vim_strnsave(name, name_len);