summaryrefslogtreecommitdiffstats
path: root/src/charset.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-02-05 15:10:51 +0100
committerBram Moolenaar <Bram@vim.org>2017-02-05 15:10:51 +0100
commit955f198fc546cc30a34361932d3f454a61df0efa (patch)
tree04a9cf18bd3af2e373747341d91e6bcc86332690 /src/charset.c
parente971df39a5aac5d9b7e8033247dc18b12daa0eb8 (diff)
patch 8.0.0307: asan detects a memory error when EXITFREE is definedv8.0.0307
Problem: Asan detects a memory error when EXITFREE is defined. (Dominique Pelle) Solution: In getvcol() check for ml_get_buf() returning an empty string. Also skip adjusting the scroll position. Set "exiting" in mch_exit() for all systems.
Diffstat (limited to 'src/charset.c')
-rw-r--r--src/charset.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/charset.c b/src/charset.c
index eb8baa9465..984d7653e7 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1296,6 +1296,10 @@ getvcol(
posptr = NULL; /* continue until the NUL */
else
{
+ /* Special check for an empty line, which can happen on exit, when
+ * ml_get_buf() always returns an empty string. */
+ if (*ptr == NUL)
+ pos->col = 0;
posptr = ptr + pos->col;
#ifdef FEAT_MBYTE
if (has_mbyte)