patch 7.4.789

Problem:    Using freed memory and crash. (Dominique Pellej)
Solution:   Correct use of pointers. (Hirohito Higashi)

diff --git a/src/option.c b/src/option.c
index 35cfd2b006ec07eb7ad6cf267cb118b15e8d5c59..a356f961355800ed636c979fea5c53bc380c1a9d 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -4943,7 +4943,8 @@ do_set(arg, opt_flags)
 
                            sprintf((char *)buf_type, "%s",
                                (opt_flags & OPT_LOCAL) ? "local" : "global");
-                           set_vim_var_string(VV_OPTION_NEW, newval, -1);
+                           set_vim_var_string(VV_OPTION_NEW,
+                                                       *(char_u **)varp, -1);
                            set_vim_var_string(VV_OPTION_OLD, saved_origval, -1);
                            set_vim_var_string(VV_OPTION_TYPE, buf_type, -1);
                            apply_autocmds(EVENT_OPTIONSET,
@@ -5738,8 +5739,8 @@ set_string_option(opt_idx, value, opt_flags)
            char_u buf_type[7];
            sprintf((char *)buf_type, "%s",
                (opt_flags & OPT_LOCAL) ? "local" : "global");
-           set_vim_var_string(VV_OPTION_NEW, s, -1);
-           set_vim_var_string(VV_OPTION_OLD, oldval, -1);
+           set_vim_var_string(VV_OPTION_NEW, *varp, -1);
+           set_vim_var_string(VV_OPTION_OLD, saved_oldval, -1);
            set_vim_var_string(VV_OPTION_TYPE, buf_type, -1);
            apply_autocmds(EVENT_OPTIONSET, (char_u *)options[opt_idx].fullname, NULL, FALSE, NULL);
            reset_v_option_vars();

diff --git a/src/version.c b/src/version.c
index aa7b0337eae04b96588e6093d15133159a4c046b..d2c8bc54bf612a89291ebe2c082bcaa958bcd624 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    789,
 /**/
     788,
 /**/