diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-06-04 19:16:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-06-04 19:16:29 +0200 |
| commit | 277e79adc4d2b62556ce8a3720684e4b3e1e6d42 (patch) | |
| tree | 15c29d5d307cd7784ef4e435f20030d13aa6290d | |
| parent | c974022c31e790136c62586eb0b0ace2d02d2afb (diff) | |
patch 8.1.1463: gcc warns for uninitialized variablev8.1.1463
Problem: Gcc warns for uninitialized variable.
Solution: Put usage inside "if". (Ken Takata)
| -rw-r--r-- | src/textprop.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/textprop.c b/src/textprop.c index 2d7567cdb0..f219b925fa 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -1240,9 +1240,12 @@ join_prop_lines( if (line == NULL) return; mch_memmove(line, newp, len); - l = oldproplen * sizeof(textprop_T); - mch_memmove(line + len, props, l); - len += l; + if (oldproplen > 0) + { + l = oldproplen * sizeof(textprop_T); + mch_memmove(line + len, props, l); + len += l; + } for (i = 0; i < count - 1; ++i) if (prop_lines[i] != NULL) diff --git a/src/version.c b/src/version.c index ec6ee205d7..7d86aaeb46 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 */ /**/ + 1463, +/**/ 1462, /**/ 1461, |