diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-03-03 20:02:19 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-03-03 20:02:19 +0100 |
| commit | 069dafc1ded60d9ee0fee4bcecce78ac8a235d87 (patch) | |
| tree | bf218ed98ca113eb8d3c818c3107e44b4089b7b7 | |
| parent | 3767b61ad99fe6ff2cace2dccb5d35331786735f (diff) | |
patch 8.0.1561: crash with rust syntax highligtingv8.0.1561
Problem: Crash with rust syntax highligting. (Edd Barrett)
Solution: Avoid going past the end of an empty line.
| -rw-r--r-- | src/syntax.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/syntax.c b/src/syntax.c index 81f4604709..d0d4515e0e 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -2470,7 +2470,8 @@ syn_current_attr( /* nextgroup ends at end of line, unless "skipnl" or "skipempty" present */ if (current_next_list != NULL - && syn_getcurline()[current_col + 1] == NUL + && (line = syn_getcurline())[current_col] != NUL + && line[current_col + 1] == NUL && !(current_next_flags & (HL_SKIPNL | HL_SKIPEMPTY))) current_next_list = NULL; diff --git a/src/version.c b/src/version.c index f8777dcfdf..ae51d723e3 100644 --- a/src/version.c +++ b/src/version.c @@ -779,6 +779,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1561, +/**/ 1560, /**/ 1559, |