# HG changeset patch # User Bram Moolenaar # Date 1637851504 -3600 # Node ID 8e0cbe0d84ec16e0d58ac1a71ff4df334753cbe5 # Parent 6c01cf7bd2885a438a3c6c408c5d513b76669148 patch 8.2.3675: using freed memory when vim_strsave() fails Commit: https://github.com/vim/vim/commit/ba8c92687d53c91bbc20c867a49e0988819ea2d5 Author: Bram Moolenaar Date: Thu Nov 25 14:43:18 2021 +0000 patch 8.2.3675: using freed memory when vim_strsave() fails Problem: Using freed memory when vim_strsave() fails. Solution: Clear "last_sourcing_name". Check for msg_source() called recursively. (closes #8217) diff --git a/src/message.c b/src/message.c --- a/src/message.c +++ b/src/message.c @@ -522,6 +522,12 @@ get_emsg_lnum(void) msg_source(int attr) { char_u *p; + static int recursive = FALSE; + + // Bail out if something called here causes an error. + if (recursive) + return; + recursive = TRUE; ++no_wait_return; p = get_emsg_source(); @@ -541,13 +547,13 @@ msg_source(int attr) // remember the last sourcing name printed, also when it's empty if (SOURCING_NAME == NULL || other_sourcing_name()) { - vim_free(last_sourcing_name); - if (SOURCING_NAME == NULL) - last_sourcing_name = NULL; - else + VIM_CLEAR(last_sourcing_name); + if (SOURCING_NAME != NULL) last_sourcing_name = vim_strsave(SOURCING_NAME); } --no_wait_return; + + recursive = FALSE; } /* diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3675, +/**/ 3674, /**/ 3673,