[git] GnuPG - branch, master, updated. gnupg-2.1.15-77-gf2249b7

[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  f2249b737055f84842778285bbeff5e61fa55225 (commit)
       via  213b3cf465fb091dc0a205d1a08b88b950ffb85f (commit)
      from  650356148af43ea619bec12e599a4981b147d5f8 (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 f2249b737055f84842778285bbeff5e61fa55225
Author: Justus Winter <justus at g10code.com>
Date:   Tue Sep 6 16:35:40 2016 +0200

    gpgscm: Fix detection of unbalanced parenthesis.
    
    * tests/gpgscm/main.c (load): Print error message.
    * tests/gpgscm/scheme.c (opexe_0): Correctly report nesting level when
    loading files.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/main.c b/tests/gpgscm/main.c
index 34ebb9f..9aef1f3 100644
--- a/tests/gpgscm/main.c
+++ b/tests/gpgscm/main.c
@@ -32,6 +32,7 @@
 
 #include "private.h"
 #include "scheme.h"
+#include "scheme-private.h"
 #include "ffi.h"
 #include "i18n.h"
 #include "../../common/argparse.h"
@@ -176,6 +177,13 @@ load (scheme *sc, char *file_name,
   scheme_load_named_file (sc, h, qualified_name);
   fclose (h);
 
+  if (sc->retcode)
+    {
+      if (sc->nesting)
+        fprintf (stderr, "%s: Unbalanced parenthesis\n", qualified_name);
+      return gpg_error (GPG_ERR_GENERAL);
+    }
+
   if (file_name != qualified_name)
     free (qualified_name);
   return 0;
diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index 987f5af..1fc7643 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -2592,6 +2592,7 @@ static pointer opexe_0(scheme *sc, enum scheme_opcodes op) {
        if(sc->file_i == 0)
          {
            sc->args=sc->NIL;
+           sc->nesting = sc->nesting_stack[0];
            s_goto(sc,OP_QUIT);
          }
        else

commit 213b3cf465fb091dc0a205d1a08b88b950ffb85f
Author: Justus Winter <justus at g10code.com>
Date:   Tue Sep 6 16:45:56 2016 +0200

    tests: Fix test.
    
    * tests/openpgp/multisig.scm: Add missing parenthesis.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/multisig.scm b/tests/openpgp/multisig.scm
index 53c905f..31cdc77 100755
--- a/tests/openpgp/multisig.scm
+++ b/tests/openpgp/multisig.scm
@@ -163,6 +163,6 @@ cnksIEkgY2FuJ3QgZG8gdGhhdAo=
       (pipe:write-to file (logior O_WRONLY O_CREAT O_BINARY) #o600))
 
      (if (= 0 (call `(, at GPG --verify ,file)))
-	 (error "Bad signature verified ok")))
+	 (error "Bad signature verified ok"))))
  '(sig-1ls1ls-valid sig-ls-valid sig-1lsls-invalid
 		    sig-lsls-invalid sig-lss-invalid sig-slsl-invalid))

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

Summary of changes:
 tests/gpgscm/main.c        | 8 ++++++++
 tests/gpgscm/scheme.c      | 1 +
 tests/openpgp/multisig.scm | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)


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