aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.2.430

Browse Source 
Problem:    The ++bad argument is handled wrong, resulting in an invalid
            memory access.
Solution:   Use the bad_char field only for the replacement character, add
            bad_char_idx to store the position. (Dominique Pelle)
This commit is contained in:
Bram Moolenaar 2010-05-14 20:41:05 +02:00
parent 2efbc66e26
commit 9c0044df7c
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/eval.c
View File

@ -18309,8 +18309,8 @@ set_cmdarg(eap, oldarg)
# ifdef FEAT_MBYTE # ifdef FEAT_MBYTE
if (eap->force_enc != 0) if (eap->force_enc != 0)
len += (unsigned)STRLEN(eap->cmd + eap->force_enc) + 7; len += (unsigned)STRLEN(eap->cmd + eap->force_enc) + 7;
if (eap->bad_char != 0) if (eap->bad_char_idx != 0)
len += (unsigned)STRLEN(eap->cmd + eap->bad_char) + 7; len += (unsigned)STRLEN(eap->cmd + eap->bad_char_idx) + 7;
# endif # endif
newval = alloc(len + 1); newval = alloc(len + 1);
@ -18334,9 +18334,9 @@ set_cmdarg(eap, oldarg)
if (eap->force_enc != 0) if (eap->force_enc != 0)
sprintf((char *)newval + STRLEN(newval), " ++enc=%s", sprintf((char *)newval + STRLEN(newval), " ++enc=%s",
eap->cmd + eap->force_enc); eap->cmd + eap->force_enc);
if (eap->bad_char != 0) if (eap->bad_char_idx != 0)
sprintf((char *)newval + STRLEN(newval), " ++bad=%s", sprintf((char *)newval + STRLEN(newval), " ++bad=%s",
eap->cmd + eap->bad_char); eap->cmd + eap->bad_char_idx);
# endif # endif
vimvars[VV_CMDARG].vv_str = newval; vimvars[VV_CMDARG].vv_str = newval;
return oldval; return oldval;

3
src/ex_cmds.h
View File

@ -1152,7 +1152,8 @@ struct exarg
int force_ff; /* ++ff= argument (index in cmd[]) */ int force_ff; /* ++ff= argument (index in cmd[]) */
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
int force_enc; /* ++enc= argument (index in cmd[]) */ int force_enc; /* ++enc= argument (index in cmd[]) */
int bad_char; /* ++bad= argument (index in cmd[]) */ int bad_char_idx; /* ++bad= argument (index in cmd[]) */
int bad_char; /* BAD_KEEP, BAD_DROP or replacement char */
#endif #endif
#ifdef FEAT_USR_CMDS #ifdef FEAT_USR_CMDS
int useridx; /* user command index */ int useridx; /* user command index */

4
src/ex_docmd.c
View File

@ -4739,7 +4739,7 @@ getargopt(eap)
else if (STRNCMP(arg, "bad", 3) == 0) else if (STRNCMP(arg, "bad", 3) == 0)
{ {
arg += 3; arg += 3;
pp = &eap->bad_char; pp = &eap->bad_char_idx;
} }
#endif #endif
@ -4770,7 +4770,7 @@ getargopt(eap)
{ {
/* Check ++bad= argument. Must be a single-byte character, "keep" or /* Check ++bad= argument. Must be a single-byte character, "keep" or
* "drop". */ * "drop". */
p = eap->cmd + eap->bad_char; p = eap->cmd + eap->bad_char_idx;
if (STRICMP(p, "keep") == 0) if (STRICMP(p, "keep") == 0)
eap->bad_char = BAD_KEEP; eap->bad_char = BAD_KEEP;
else if (STRICMP(p, "drop") == 0) else if (STRICMP(p, "drop") == 0)

2
src/version.c
View File

@ -681,6 +681,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
430,
/**/ /**/
429, 429,
/**/ /**/