[Pkg-gnupg-commit] [gnupg2] 270/292: gpgscm: Re-enable the garbage collector in case of errors.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

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>
---
 tests/gpgscm/scheme.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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));
                }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git