[Pkg-gnupg-commit] [gnupg2] 07/116: gpgscm: Guard use of union member.

[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 6e96cdd41a0e55b672309431062f37c4a4a9f485
Author: Justus Winter <justus at g10code.com>
Date:   Wed Dec 21 16:14:45 2016 +0100

    gpgscm: Guard use of union member.
    
    * tests/gpgscm/scheme.c (opexe_5): Check that we have a file port
    before accessing filename.  Fixes a crash on 32-bit architectures.
    
    Fixes-commit: e7429b1ced0c69fa7901f888f8dc25f00fc346a4
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 tests/gpgscm/scheme.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index a5b7691..2844545 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -4838,7 +4838,7 @@ static pointer opexe_5(scheme *sc, enum scheme_opcodes op) {
                } else {
                     sc->nesting_stack[sc->file_i]++;
 #if USE_TAGS && SHOW_ERROR_LINE
-		    {
+		    if (sc->load_stack[sc->file_i].kind & port_file) {
 		      const char *filename =
 			sc->load_stack[sc->file_i].rep.stdio.filename;
 		      int lineno =

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