From 2a6423eba732b005e277bac393f2246308dcc378 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Jul 2017 22:03:31 +0300
Subject: api helpers: Save/restore more values in try_enter/try_leave

This fixes memory leak reported by ASAN. This also somehow fixes test40, though
I have no idea why except that that test yields memory leak report.
---
 src/nvim/api/private/helpers.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/nvim/api/private/helpers.c')

diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index a04cc9a312..6ff56709cd 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -49,13 +49,17 @@ void try_enter(TryState *const tstate)
     .trylevel = trylevel,
     .got_int = got_int,
     .did_throw = did_throw,
+    .need_rethrow = need_rethrow,
+    .current_exception = current_exception,
     .msg_list = (const struct msglist *const *)msg_list,
     .private_msg_list = NULL,
   };
   trylevel = 1;
   got_int = false;
   did_throw = false;
+  need_rethrow = false;
   msg_list = &tstate->private_msg_list;
+  current_exception = NULL;
 }
 
 /// End try block, set the error message if any and restore previous state
@@ -72,14 +76,17 @@ bool try_leave(const TryState *const tstate, Error *const err)
 {
   const bool ret = !try_end(err);
   assert(trylevel == 0);
+  assert(!need_rethrow);
   assert(!got_int);
   assert(!did_throw);
   assert(msg_list == &tstate->private_msg_list);
   assert(*msg_list == NULL);
+  assert(current_exception == NULL);
   trylevel = tstate->trylevel;
   got_int = tstate->got_int;
   did_throw = tstate->did_throw;
   msg_list = (struct msglist **)tstate->msg_list;
+  current_exception = tstate->current_exception;
   return ret;
 }
 
@@ -96,6 +103,8 @@ void try_start(void)
 /// @return true if an error occurred
 bool try_end(Error *err)
 {
+  // Note: all globals manipulated here should be saved/restored in
+  // try_enter/try_leave.
   --trylevel;
 
   // Without this it stops processing all subsequent VimL commands and
-- 
cgit