]> granicus.if.org Git - vim/commitdiff
updated for version 7.4.161 v7.4.161
authorBram Moolenaar <Bram@vim.org>
Fri, 31 Jan 2014 13:54:04 +0000 (14:54 +0100)
committerBram Moolenaar <Bram@vim.org>
Fri, 31 Jan 2014 13:54:04 +0000 (14:54 +0100)
Problem:    Crash in Python exception handling.
Solution:   Only use exception variables if did_throw is set. (ZyX)

src/if_py_both.h
src/version.c

index 4d81a4b9276fbc4c387865e0dd933e8f2df44b59..dd7e82a713e080a5e524f8d0cdfabc0b3805d5bd 100644 (file)
@@ -564,10 +564,8 @@ VimTryEnd(void)
     /* 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 @@ VimTryEnd(void)
     /* 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 */
index 974c8f88fe916412e03a3afc2e2bb1709bb5218f..8501c0871a091092442bae73354bb446d27d6da8 100644 (file)
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    161,
 /**/
     160,
 /**/