Mercurial > vim

comparison src/option.c @ 6941:b63f09edb493 v7.4.789

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 7.4.789 Problem: Using freed memory and crash. (Dominique Pellej) Solution: Correct use of pointers. (Hirohito Higashi)
author Bram Moolenaar <bram@vim.org>
date Sun, 19 Jul 2015 14:42:23 +0200
parents ca0990adc2e3
children 1e621b31948b
comparison
equal deleted inserted replaced
6940:0942c7d802ea 6941:b63f09edb493
4941 { 4941 {
4942 char_u buf_type[7]; 4942 char_u buf_type[7];
4943 4943
4944 sprintf((char *)buf_type, "%s", 4944 sprintf((char *)buf_type, "%s",
4945 (opt_flags & OPT_LOCAL) ? "local" : "global"); 4945 (opt_flags & OPT_LOCAL) ? "local" : "global");
4946 set_vim_var_string(VV_OPTION_NEW, newval, -1); 4946 set_vim_var_string(VV_OPTION_NEW,
4947 *(char_u **)varp, -1);
4947 set_vim_var_string(VV_OPTION_OLD, saved_origval, -1); 4948 set_vim_var_string(VV_OPTION_OLD, saved_origval, -1);
4948 set_vim_var_string(VV_OPTION_TYPE, buf_type, -1); 4949 set_vim_var_string(VV_OPTION_TYPE, buf_type, -1);
4949 apply_autocmds(EVENT_OPTIONSET, 4950 apply_autocmds(EVENT_OPTIONSET,
4950 (char_u *)options[opt_idx].fullname, 4951 (char_u *)options[opt_idx].fullname,
4951 NULL, FALSE, NULL); 4952 NULL, FALSE, NULL);
5736 if (saved_oldval != NULL) 5737 if (saved_oldval != NULL)
5737 { 5738 {
5738 char_u buf_type[7]; 5739 char_u buf_type[7];
5739 sprintf((char *)buf_type, "%s", 5740 sprintf((char *)buf_type, "%s",
5740 (opt_flags & OPT_LOCAL) ? "local" : "global"); 5741 (opt_flags & OPT_LOCAL) ? "local" : "global");
5741 set_vim_var_string(VV_OPTION_NEW, s, -1); 5742 set_vim_var_string(VV_OPTION_NEW, *varp, -1);
5742 set_vim_var_string(VV_OPTION_OLD, oldval, -1); 5743 set_vim_var_string(VV_OPTION_OLD, saved_oldval, -1);
5743 set_vim_var_string(VV_OPTION_TYPE, buf_type, -1); 5744 set_vim_var_string(VV_OPTION_TYPE, buf_type, -1);
5744 apply_autocmds(EVENT_OPTIONSET, (char_u *)options[opt_idx].fullname, NULL, FALSE, NULL); 5745 apply_autocmds(EVENT_OPTIONSET, (char_u *)options[opt_idx].fullname, NULL, FALSE, NULL);
5745 reset_v_option_vars(); 5746 reset_v_option_vars();
5746 vim_free(saved_oldval); 5747 vim_free(saved_oldval);
5747 } 5748 }