updated for version 7.4.161
Problem: Crash in Python exception handling.
Solution: Only use exception variables if did_throw is set. (ZyX)
diff --git a/src/if_py_both.h b/src/if_py_both.h
index 4d81a4b..dd7e82a 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -564,10 +564,8 @@
/* Keyboard interrupt should be preferred over anything else */
if (got_int)
{
- if (current_exception != NULL)
+ if (did_throw)
discard_current_exception();
- else
- need_rethrow = did_throw = FALSE;
got_int = FALSE;
PyErr_SetNone(PyExc_KeyboardInterrupt);
return -1;
@@ -599,10 +597,7 @@
/* Python exception is preferred over vim one; unlikely to occur though */
else if (PyErr_Occurred())
{
- if (current_exception != NULL)
- discard_current_exception();
- else
- need_rethrow = did_throw = FALSE;
+ discard_current_exception();
return -1;
}
/* Finally transform VimL exception to python one */
diff --git a/src/version.c b/src/version.c
index 974c8f8..8501c08 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 161,
+/**/
160,
/**/
159,