Merge #9047 from jamessan/log-crash

This commit is contained in:
Justin M. Keyes 2018-09-25 08:07:51 +02:00 committed by GitHub
commit 7862c3ae3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions

View File

@ -109,6 +109,12 @@ bool logmsg(int log_level, const char *context, const char *func_name,
return false; return false;
} }
#ifdef EXITFREE
// Logging after we've already started freeing all our memory will only cause
// pain. We need access to VV_PROGPATH, homedir, etc.
assert(!entered_free_all_mem);
#endif
log_lock(); log_lock();
bool ret = false; bool ret = false;
FILE *log_file = open_log_file(); FILE *log_file = open_log_file();

View File

@ -149,11 +149,12 @@ void mch_exit(int r)
stream_set_blocking(input_global_fd(), true); // normalize stream (#2598) stream_set_blocking(input_global_fd(), true); // normalize stream (#2598)
} }
ILOG("Nvim exit: %d", r);
#ifdef EXITFREE #ifdef EXITFREE
free_all_mem(); free_all_mem();
#endif #endif
ILOG("Nvim exit: %d", r);
exit(r); exit(r);
} }