diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-02-11 13:46:35 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-02-11 19:03:27 +0100 |
| commit | abed6a0b1a71e54b143e98678f4daa6818b02f8d (patch) | |
| tree | fed29c0808a3b0fe88d1e5c41f00b4d270b42554 /src/nvim/ops.c | |
| parent | 4b7f7be3018563905d55197b43707ebe4ca12e78 (diff) | |
| download | rneovim-abed6a0b1a71e54b143e98678f4daa6818b02f8d.tar.gz rneovim-abed6a0b1a71e54b143e98678f4daa6818b02f8d.tar.bz2 rneovim-abed6a0b1a71e54b143e98678f4daa6818b02f8d.zip | |
vim-patch:8.0.1475: invalid memory access in read_redo()
Problem: Invalid memory access in read_redo(). (gy741)
Solution: Convert the replacement character back from a negative number to
CR or NL. (hint by Dominique Pelle, closes vim/vim#2616)
https://github.com/vim/vim/commit/f12519dec88251305793f1651f558d16506b4be2
Diffstat (limited to 'src/nvim/ops.c')
| -rw-r--r-- | src/nvim/ops.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 665a102253..4d974f5760 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -1629,13 +1629,18 @@ int op_replace(oparg_T *oap, int c) colnr_T oldlen; struct block_def bd; char_u *after_p = NULL; - int had_ctrl_v_cr = (c == -1 || c == -2); + int had_ctrl_v_cr = false; if ((curbuf->b_ml.ml_flags & ML_EMPTY ) || oap->empty) return OK; /* nothing to do */ - if (had_ctrl_v_cr) - c = (c == -1 ? '\r' : '\n'); + if (c == REPLACE_CR_NCHAR) { + had_ctrl_v_cr = true; + c = CAR; + } else if (c == REPLACE_NL_NCHAR) { + had_ctrl_v_cr = true; + c = NL; + } if (has_mbyte) mb_adjust_opend(oap); @@ -1713,7 +1718,7 @@ int op_replace(oparg_T *oap, int c) // insert pre-spaces memset(newp + bd.textcol, ' ', (size_t)bd.startspaces); // insert replacement chars CHECK FOR ALLOCATED SPACE - // -1/-2 is used for entering CR literally. + // REPLACE_CR_NCHAR/REPLACE_NL_NCHAR is used for entering CR literally. size_t after_p_len = 0; if (had_ctrl_v_cr || (c != '\r' && c != '\n')) { // strlen(newp) at this point |