Mercurial > vim
diff src/eval.c @ 2168:99b00399c7b4 vim73
updated for version 7.2.435
Problem: Crash when using bad_char_idx uninitialized. (Patrick Texier)
Solution: Don't use bad_char_idx, reproduce the ++bad argument from bad_char.
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Sun, 16 May 2010 13:26:25 +0200 |
parents | 99b225e0dbc1 |
children | cd6e6876308e a8afba7027ae |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -18309,8 +18309,8 @@ set_cmdarg(eap, oldarg) # ifdef FEAT_MBYTE if (eap->force_enc != 0) len += (unsigned)STRLEN(eap->cmd + eap->force_enc) + 7; - if (eap->bad_char_idx != 0) - len += (unsigned)STRLEN(eap->cmd + eap->bad_char_idx) + 7; + if (eap->bad_char != 0) + len += 7 + 4; /* " ++bad=" + "keep" or "drop" */ # endif newval = alloc(len + 1); @@ -18334,9 +18334,12 @@ set_cmdarg(eap, oldarg) if (eap->force_enc != 0) sprintf((char *)newval + STRLEN(newval), " ++enc=%s", eap->cmd + eap->force_enc); - if (eap->bad_char_idx != 0) - sprintf((char *)newval + STRLEN(newval), " ++bad=%s", - eap->cmd + eap->bad_char_idx); + if (eap->bad_char == BAD_KEEP) + STRCPY(newval + STRLEN(newval), " ++bad=keep"); + else if (eap->bad_char == BAD_DROP) + STRCPY(newval + STRLEN(newval), " ++bad=drop"); + else if (eap->bad_char != 0) + sprintf((char *)newval + STRLEN(newval), " ++bad=%c", eap->bad_char); # endif vimvars[VV_CMDARG].vv_str = newval; return oldval;