blob: 2262291cd8b55583924c4e84b1860a6d8911a033 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
--- src/engine-gpg.c
+++ src/engine-gpg.c
@@ -61,6 +61,15 @@
building command line to this location. */
char arg[FLEXIBLE_ARRAY_MEMBER]; /* Used if data above is not used. */
};
+struct arg_without_data_s
+{
+ struct arg_and_data_s *next;
+ gpgme_data_t data;
+ int inbound;
+ int dup_to;
+ int print_fd;
+ int *arg_locp;
+};
struct fd_data_map_s
@@ -310,23 +319,24 @@
a = malloc (offsetof (struct arg_and_data_s, arg));
if (!a)
return gpg_error_from_syserror ();
- a->next = NULL;
- a->data = data;
- a->inbound = inbound;
- a->arg_locp = NULL;
+ struct arg_without_data_s *a2 = (struct arg_without_data_s *)a;
+ a2->next = NULL;
+ a2->data = data;
+ a2->inbound = inbound;
+ a2->arg_locp = NULL;
if (dup_to == -2)
{
- a->print_fd = 1;
- a->dup_to = -1;
+ a2->print_fd = 1;
+ a2->dup_to = -1;
}
else
{
- a->print_fd = 0;
- a->dup_to = dup_to;
+ a2->print_fd = 0;
+ a2->dup_to = dup_to;
}
*gpg->argtail = a;
- gpg->argtail = &a->next;
+ gpg->argtail = &a2->next;
return 0;
}
|
