[git] GnuPG - branch, master, updated. gnupg-2.1.15-385-g4f18932

[by Justus Winter]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  4f189325a409bb08f7a8eabfac3f4579288cf5c5 (commit)
       via  fc53a4d06eaf891143ab4efec9caffe31ebc2bc0 (commit)
      from  bd91f92ace09263e3a91177f2a1644379baeb08a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4f189325a409bb08f7a8eabfac3f4579288cf5c5
Author: Justus Winter <justus at g10code.com>
Date:   Thu Nov 17 11:58:34 2016 +0100

    gpgscm: Re-enable the garbage collector in case of errors.
    
    * tests/gpgscm/scheme.c (opexe_0): Enable gc before calling 'Error_1'.
    
    Fixes-commit: 83c184a66b73f312425b01008f0495610e5329a4
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index fe8b9dd..ee8992e 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -709,7 +709,8 @@ gc_reservation_failure(struct scheme *sc)
 
 /* Disable the garbage collection and reserve the given number of
  * cells.  gc_disable may be nested, but the enclosing reservation
- * must include the reservations of all nested calls.  */
+ * must include the reservations of all nested calls.  Note: You must
+ * re-enable the gc before calling Error_X.  */
 static void
 _gc_disable(struct scheme *sc, size_t reserve, int lineno)
 {
@@ -3013,6 +3014,7 @@ static pointer opexe_0(scheme *sc, enum scheme_opcodes op) {
           sc->args = cons(sc, sc->value, sc->args);
           if (is_pair(sc->code)) { /* continue */
                if (!is_pair(car(sc->code)) || !is_pair(cdar(sc->code))) {
+		    gc_enable(sc);
                     Error_1(sc, "Bad syntax of binding spec in let :",
                             car(sc->code));
                }

commit fc53a4d06eaf891143ab4efec9caffe31ebc2bc0
Author: Justus Winter <justus at g10code.com>
Date:   Wed Nov 16 09:26:37 2016 +0100

    gpgscm: Fix string.
    
    * tests/gpgscm/scheme.c (type_to_string): Fix string.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index 1db6456..fe8b9dd 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -144,7 +144,7 @@ type_to_string (enum scheme_types typ)
      case T_PROC: return "proc";
      case T_PAIR: return "pair";
      case T_CLOSURE: return "closure";
-     case T_CONTINUATION: return "configuration";
+     case T_CONTINUATION: return "continuation";
      case T_FOREIGN: return "foreign";
      case T_CHARACTER: return "character";
      case T_PORT: return "port";

-----------------------------------------------------------------------

Summary of changes:
 tests/gpgscm/scheme.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org