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)
diff --git a/src/memline.c b/src/memline.c
index 480e93c..29a6e5c 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -3087,12 +3087,19 @@
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 @@
}
}
vim_free(new_line);
+
+ entered = FALSE;
}
buf->b_ml.ml_line_lnum = 0;
diff --git a/src/version.c b/src/version.c
index d71cbbc..5ffee97 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 359,
+/**/
358,
/**/
357,
