chiark / gitweb /
gnupg2 (2.1.17-3) unstable; urgency=medium
[gnupg2.git] / debian / patches / 0012-gpgscm-Guard-use-of-union-member.patch
1 From: Justus Winter <justus@g10code.com>
2 Date: Wed, 21 Dec 2016 16:14:45 +0100
3 Subject: gpgscm: Guard use of union member.
4
5 * tests/gpgscm/scheme.c (opexe_5): Check that we have a file port
6 before accessing filename.  Fixes a crash on 32-bit architectures.
7
8 Fixes-commit: e7429b1ced0c69fa7901f888f8dc25f00fc346a4
9 Signed-off-by: Justus Winter <justus@g10code.com>
10 (cherry picked from commit 6e96cdd41a0e55b672309431062f37c4a4a9f485)
11 ---
12  tests/gpgscm/scheme.c | 2 +-
13  1 file changed, 1 insertion(+), 1 deletion(-)
14
15 diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
16 index a5b7691fb..284454557 100644
17 --- a/tests/gpgscm/scheme.c
18 +++ b/tests/gpgscm/scheme.c
19 @@ -4838,7 +4838,7 @@ static pointer opexe_5(scheme *sc, enum scheme_opcodes op) {
20                 } else {
21                      sc->nesting_stack[sc->file_i]++;
22  #if USE_TAGS && SHOW_ERROR_LINE
23 -                   {
24 +                   if (sc->load_stack[sc->file_i].kind & port_file) {
25                       const char *filename =
26                         sc->load_stack[sc->file_i].rep.stdio.filename;
27                       int lineno =