Mercurial > vim
changeset 2075:903fcd726d90 v7.2.359
updated for version 7.2.359
Problem: Crash when using the Netbeans join command.
Solution: Make sure the ml_flush_line() function is not used recursively.
(Xavier de Gaye)
| author | Bram Moolenaar <bram@zimbu.org> |
|---|---|
| date | Thu, 11 Feb 2010 18:54:43 +0100 |
| parents | 1bb06e6512a2 |
| children | 1c7a66d820e4 |
| files | src/memline.c src/version.c |
| diffstat | 2 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/memline.c +++ b/src/memline.c @@ -3087,12 +3087,19 @@ ml_flush_line(buf) int start; int count; int i; + static int entered = FALSE; if (buf->b_ml.ml_line_lnum == 0 || buf->b_ml.ml_mfp == NULL) return; /* nothing to do */ if (buf->b_ml.ml_flags & ML_LINE_DIRTY) { + /* This code doesn't work recursively, but Netbeans may call back here + * when obtaining the cursor position. */ + if (entered) + return; + entered = TRUE; + lnum = buf->b_ml.ml_line_lnum; new_line = buf->b_ml.ml_line_ptr; @@ -3160,6 +3167,8 @@ ml_flush_line(buf) } } vim_free(new_line); + + entered = FALSE; } buf->b_ml.ml_line_lnum = 0;