security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-04 20:38:50 +01:00
Code Activity

* decrypt.c (decrypt_messages): Fixed error handling; the fucntion

Browse Source 
used to re-loop with same file after an error.  Reported by Joseph
Walton.
This commit is contained in:
Werner Koch 2003-04-09 08:03:17 +00:00
parent 78da3fdfaa
commit 5a9e7663c1
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
THANKS
View File

@ -102,6 +102,7 @@ John A. Martin jam@jamux.com
Johnny Teveßen j.tevessen@gmx.de
Jörg Schilling schilling@fokus.gmd.de
Jos Backus Jos.Backus@nl.origin-it.com
Joseph Walton joe@kafsemo.org
Jun Kuriyama kuriyama@sky.rim.or.jp
Kahil D. Jallad kdj4@cs.columbia.edu
Karl Fogel kfogel@guanabana.onshore.com

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2003-04-09 Werner Koch <wk@gnupg.org>
* decrypt.c (decrypt_messages): Fixed error handling; the fucntion
used to re-loop with same file after an error. Reported by Joseph
Walton.
2003-04-08 David Shaw <dshaw@jabberwocky.com>
* hkp.c (dehtmlize): Fix bug #121 (memory corruption on some

21
g10/decrypt.c
View File

@ -1,5 +1,5 @@
/* decrypt.c - verify signed data
* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
* Copyright (C) 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@ -99,12 +99,12 @@ decrypt_messages(int nfiles, char **files)
print_file_status(STATUS_FILE_START, *files, 3);
output = make_outfile_name(*files);
if (!output)
continue;
goto next_file;
fp = iobuf_open(*files);
if (!fp)
{
log_error(_("can't open `%s'\n"), print_fname_stdin(*files));
continue;
goto next_file;
}
if (!opt.no_armor)
{
@ -122,17 +122,12 @@ decrypt_messages(int nfiles, char **files)
p = get_last_passphrase();
set_next_passphrase(p);
m_free (p);
files++;
m_free(output);
next_file:
/* Note that we emit file_done even after an error. */
write_status( STATUS_FILE_DONE );
m_free(output);
files++;
}
set_next_passphrase(NULL);
}