aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/memory.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-09-05 21:54:23 +0800
committerzeertzjq <zeertzjq@outlook.com>2022-09-05 22:36:09 +0800
commitfc7a64291a5ed074eafff47b21b411bfe9d4a19e (patch)
tree3ff3577ce7c339201a238867562cc0a5798d4352 /src/nvim/memory.c
parenta220650fd6ef6490a787eb7efcab24b4bf13dab8 (diff)
downloadrneovim-fc7a64291a5ed074eafff47b21b411bfe9d4a19e.tar.gz
rneovim-fc7a64291a5ed074eafff47b21b411bfe9d4a19e.tar.bz2
rneovim-fc7a64291a5ed074eafff47b21b411bfe9d4a19e.zip
vim-patch:9.0.0386: some code blocks are nested too deep
Problem: Some code blocks are nested too deep. Solution: Bail out earlier. (Yegappan Lakshmanan, closes vim/vim#11058) https://github.com/vim/vim/commit/b1f471ee20b0fa783ecd6e29aa69067e6c821376
Diffstat (limited to 'src/nvim/memory.c')
-rw-r--r--src/nvim/memory.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index e5fea027cb..03cfde6160 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -506,16 +506,18 @@ bool striequal(const char *a, const char *b)
// Did_outofmem_msg is reset when a character is read.
void do_outofmem_msg(size_t size)
{
- if (!did_outofmem_msg) {
- // Don't hide this message
- emsg_silent = 0;
+ if (did_outofmem_msg) {
+ return;
+ }
- /* Must come first to avoid coming back here when printing the error
- * message fails, e.g. when setting v:errmsg. */
- did_outofmem_msg = true;
+ // Don't hide this message
+ emsg_silent = 0;
- semsg(_("E342: Out of memory! (allocating %" PRIu64 " bytes)"), (uint64_t)size);
- }
+ // Must come first to avoid coming back here when printing the error
+ // message fails, e.g. when setting v:errmsg.
+ did_outofmem_msg = true;
+
+ semsg(_("E342: Out of memory! (allocating %" PRIu64 " bytes)"), (uint64_t)size);
}
/// Writes time_t to "buf[8]".