diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-05-24 10:51:30 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-05-24 10:51:30 +0200 |
| commit | 908be438794619f10ef7fa25e24e5893b2ae0189 (patch) | |
| tree | 24528529e9fe0191ffc5d9988ae32ab9b610f456 /src | |
| parent | 2ff8b64679242e73248774a388d54931c9ce49bd (diff) | |
| download | vim-908be438794619f10ef7fa25e24e5893b2ae0189.zip | |
patch 7.4.1834
Problem: Possible crash when conceal is active.
Solution: Check for the screen to be valid when redrawing a line.
Diffstat (limited to 'src')
| -rw-r--r-- | src/screen.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/screen.c b/src/screen.c index a72bffa53..2e425cba4 100644 --- a/src/screen.c +++ b/src/screen.c @@ -801,6 +801,10 @@ update_single_line(win_T *wp, linenr_T lnum) int row; int j; + /* Don't do anything if the screen structures are (not yet) valid. */ + if (!screen_valid(TRUE)) + return; + if (lnum >= wp->w_topline && lnum < wp->w_botline && foldedCount(wp, lnum, &win_foldinfo) == 0) { diff --git a/src/version.c b/src/version.c index eaa3e8ec9..417a3aa57 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1834, +/**/ 1833, /**/ 1832, |