aboutsummaryrefslogtreecommitdiffstats
path: root/g10/decrypt-data.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2019-07-12 11:57:00 +0000
committerWerner Koch <[email protected]>2019-07-12 11:57:00 +0000
commita5118b19c182b558635a6a11ef55b6b8a18c04e9 (patch)
tree16f59401d004b086e1a00c7dad8e4a7523af2fae /g10/decrypt-data.c
parentMerge branch 'master' into switch-to-gpgk (diff)
parentscd: Remove useless GNUPG_SCD_MAIN_HEADER macro. (diff)
downloadgnupg-a5118b19c182b558635a6a11ef55b6b8a18c04e9.tar.gz
gnupg-a5118b19c182b558635a6a11ef55b6b8a18c04e9.zip
Merge branch 'master' into switch-to-gpgk
Diffstat (limited to 'g10/decrypt-data.c')
-rw-r--r--g10/decrypt-data.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/decrypt-data.c b/g10/decrypt-data.c
index 4d9dc86d9..c73d5fb45 100644
--- a/g10/decrypt-data.c
+++ b/g10/decrypt-data.c
@@ -471,6 +471,7 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
{
char *filename = NULL;
estream_t fp;
+
rc = get_output_file ("", 0, ed->buf, &filename, &fp);
if (! rc)
{
@@ -492,8 +493,7 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
filename, gpg_strerror (rc));
iobuf_close (output);
- if (afx)
- release_armor_context (afx);
+ release_armor_context (afx);
}
xfree (filename);
}