diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-12-11 15:52:01 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-12-11 15:52:01 +0100 |
| commit | 1d633413e5961589c2ae81300c96197443eee0c8 (patch) | |
| tree | 46b5ec5d9b3443e88dc8d69012d390c2648bc536 | |
| parent | 6b10721fa2d883540c1c106ef26fff8abed0ac43 (diff) | |
updated for version 7.4.118v7.4.118
Problem: It's possible that redrawing the status lines causes
win_redr_custom() to be called recursively.
Solution: Protect against recursiveness. (Yasuhiro Matsumoto)
| -rw-r--r-- | src/screen.c | 13 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c index f738e2bb6a..a030207ae1 100644 --- a/src/screen.c +++ b/src/screen.c @@ -6653,6 +6653,7 @@ win_redr_custom(wp, draw_ruler) win_T *wp; int draw_ruler; /* TRUE or FALSE */ { + static int entered = FALSE; int attr; int curattr; int row; @@ -6671,6 +6672,13 @@ win_redr_custom(wp, draw_ruler) win_T *ewp; int p_crb_save; + /* There is a tiny chance that this gets called recursively: When + * redrawing a status line triggers redrawing the ruler or tabline. + * Avoid trouble by not allowing recursion. */ + if (entered) + return; + entered = TRUE; + /* setup environment for the task at hand */ if (wp == NULL) { @@ -6746,7 +6754,7 @@ win_redr_custom(wp, draw_ruler) } if (maxwidth <= 0) - return; + goto theend; /* Temporarily reset 'cursorbind', we don't want a side effect from moving * the cursor away and back. */ @@ -6827,6 +6835,9 @@ win_redr_custom(wp, draw_ruler) while (col < Columns) TabPageIdxs[col++] = fillchar; } + +theend: + entered = FALSE; } #endif /* FEAT_STL_OPT */ diff --git a/src/version.c b/src/version.c index a8c54a9a67..29d41a9dae 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 118, +/**/ 117, /**/ 116, |