diff options
| author | Werner Koch <[email protected]> | 2016-12-08 18:02:56 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-12-08 18:02:56 +0000 |
| commit | cb4c7abb774e2d95806d8b0ec6ea5cd130c1b5b8 (patch) | |
| tree | ead5a6b4e8cbefab773836c6ccba1abc33e417e5 /dirmngr/loadswdb.c | |
| parent | wks: New option --status-fd for gpg-wks-client. (diff) | |
| download | gnupg-cb4c7abb774e2d95806d8b0ec6ea5cd130c1b5b8.tar.gz gnupg-cb4c7abb774e2d95806d8b0ec6ea5cd130c1b5b8.zip | |
Fix 2 compiler warnings.
* dirmngr/loadswdb.c: Set ERR on malloc failure.
* g10/passphrase.c (passphrase_to_dek): Initialize all fields of
HELP_S2K.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'dirmngr/loadswdb.c')
| -rw-r--r-- | dirmngr/loadswdb.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dirmngr/loadswdb.c b/dirmngr/loadswdb.c index bc56c2ab3..2d6bdc126 100644 --- a/dirmngr/loadswdb.c +++ b/dirmngr/loadswdb.c @@ -272,7 +272,10 @@ dirmngr_load_swdb (ctrl_t ctrl, int force) /* Create the filename of the file with the keys. */ keyfile_fname = make_filename_try (gnupg_datadir (), "distsigkey.gpg", NULL); if (!keyfile_fname) - goto leave; + { + err = gpg_error_from_syserror (); + goto leave; + } /* Fetch the swdb from the web. */ err = fetch_file (ctrl, "https://versions.gnupg.org/swdb.lst", &swdb); |