updated for version 7.0-172

diff --git a/src/ex_eval.c b/src/ex_eval.c
index 8714958f05523b8586aef32cf09beb4a778cadc7..441e98dfeb555b43472e653cb8e36964642af00f 100644 (file)
--- a/src/ex_eval.c
+++ b/src/ex_eval.c
@@ -340,7 +340,7 @@ do_errthrow(cstack, cmdname)
 
     /* If no exception is to be thrown or the conversion should be done after
      * returning to a previous invocation of do_one_cmd(), do nothing. */
-    if (*msg_list == NULL)
+    if (msg_list == NULL || *msg_list == NULL)
        return;
 
     if (throw_exception(*msg_list, ET_ERROR, cmdname) == FAIL)
@@ -2026,8 +2026,11 @@ leave_cleanup(csp)
 
        /* If an error was about to be converted to an exception when
         * enter_cleanup() was called, free the message list. */
-       free_msglist(*msg_list);
-       *msg_list = NULL;
+       if (msg_list != NULL)
+       {
+           free_msglist(*msg_list);
+           *msg_list = NULL;
+       }
     }
 
     /*

diff --git a/src/version.c b/src/version.c
index c2f78aa9b5f0ad565b3dd8177358cb5c14d9178f..1bf84d35ba5ef6936ce566d3db72231430b7f0bc 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    172,
 /**/
     171,
 /**/