diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-04-27 19:15:45 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-04-27 19:15:45 +0200 |
commit | 2155a6abaa5d065ad7b580229321860591126f2e (patch) | |
tree | 10d00c5fbdd9332bf8bfed5e5c3aa05083a2e8e1 | |
parent | c1b8160b44b43cca3acd7a47c1b85350cb648fe5 (diff) | |
download | vim-git-2155a6abaa5d065ad7b580229321860591126f2e.tar.gz |
patch 8.1.1217: MS-Windows: no space reserved for font quality namev8.1.1217
Problem: MS-Windows: no space reserved for font quality name.
Solution: Add quality_name length if present. (Ken Takata, closes #4311)
-rw-r--r-- | src/gui_w32.c | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index 10af357cc..dbc8d95a4 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -3127,7 +3127,8 @@ logfont2name(LOGFONTW lf) quality_name = quality_id2name((int)lf.lfQuality); res = (char *)alloc((unsigned)(strlen(font_name) + 20 - + (charset_name == NULL ? 0 : strlen(charset_name) + 2))); + + (charset_name == NULL ? 0 : strlen(charset_name) + 2) + + (quality_name == NULL ? 0 : strlen(quality_name) + 2))); if (res != NULL) { p = res; diff --git a/src/version.c b/src/version.c index 533751297..4c2620f29 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1217, +/**/ 1216, /**/ 1215, |