diff options
| author | Werner Koch <[email protected]> | 2017-12-18 15:38:02 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-12-18 15:42:59 +0000 |
| commit | c817e750283278e7e8317c1b47981e71ddcc9dbf (patch) | |
| tree | 0865a55b588243ac2883c483959ec483c4c2e9ae /g10/revoke.c | |
| parent | po: Update Japanese translation. (diff) | |
| parent | gpgconf: Show --compliance in expert mode. (diff) | |
| download | gnupg-c817e750283278e7e8317c1b47981e71ddcc9dbf.tar.gz gnupg-c817e750283278e7e8317c1b47981e71ddcc9dbf.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/revoke.c')
| -rw-r--r-- | g10/revoke.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/g10/revoke.c b/g10/revoke.c index 457870082..846523295 100644 --- a/g10/revoke.c +++ b/g10/revoke.c @@ -536,7 +536,20 @@ gen_standard_revoke (ctrl_t ctrl, PKT_public_key *psk, const char *cache_nonce) dir = get_openpgp_revocdir (gnupg_homedir ()); tmpstr = hexfingerprint (psk, NULL, 0); - fname = xstrconcat (dir, DIRSEP_S, tmpstr, NULL); + if (!tmpstr) + { + rc = gpg_error_from_syserror (); + xfree (dir); + return rc; + } + fname = strconcat (dir, DIRSEP_S, tmpstr, NULL); + if (!fname) + { + rc = gpg_error_from_syserror (); + xfree (tmpstr); + xfree (dir); + return rc; + } xfree (tmpstr); xfree (dir); |