diff options
| author | Werner Koch <wk@gnupg.org> | 2019-05-17 13:40:24 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2019-05-17 13:40:24 +0200 |
| commit | 386bacd9741639d7f5e83c81628d3cad78407197 (patch) | |
| tree | b2b4e5c69c837a69eab9ff001a839cbf6e4f3678 /g10/plaintext.c | |
| parent | gpg: Improve the photo image viewer selection. (diff) | |
| download | gnupg2-386bacd9741639d7f5e83c81628d3cad78407197.tar.xz gnupg2-386bacd9741639d7f5e83c81628d3cad78407197.zip | |
gpg: Fix using --decrypt along with --use-embedded-filename.
* g10/options.h (opt): Add flags.dummy_outfile.
* g10/decrypt.c (decrypt_message): Set this global flag instead of the
fucntion local flag.
* g10/plaintext.c (get_output_file): Ignore opt.output if that was
used as a dummy option aslong with --use-embedded-filename.
--
The problem here was that an explicit specified --decrypt, as
meanwhile suggested, did not work with that dangerous
--use-embedded-filename. In contrast it worked when gpg decrypted as
a side-effect of parsing the data.
GnuPG-bug-id: 4500
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/plaintext.c')
| -rw-r--r-- | g10/plaintext.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/plaintext.c b/g10/plaintext.c index c5d1ddb7f..f9e0a4296 100644 --- a/g10/plaintext.c +++ b/g10/plaintext.c @@ -70,7 +70,8 @@ get_output_file (const byte *embedded_name, int embedded_namelen, goto leave; } } - else if (opt.outfile) + else if (opt.outfile + && !(opt.flags.use_embedded_filename && opt.flags.dummy_outfile)) { fname = xtrystrdup (opt.outfile); if (!fname) |