diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-02-09 16:00:55 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-02-09 16:00:55 +0900 |
| commit | 809c8ad8209b0f5248cfc52eb6e1d437099fb228 (patch) | |
| tree | 4ff29660e2c3e34b5e5e788dc3b6bd82b71a6177 /g10 | |
| parent | 3fa155501284154ac65df51202a8440ce53360d5 (diff) | |
| download | gpg2-809c8ad8209b0f5248cfc52eb6e1d437099fb228.tar.gz gpg2-809c8ad8209b0f5248cfc52eb6e1d437099fb228.tar.bz2 gpg2-809c8ad8209b0f5248cfc52eb6e1d437099fb228.zip | |
Imported Upstream version 2.2.23upstream/2.2.23
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/getkey.c | 2 | ||||
| -rw-r--r-- | g10/key-check.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 3d0dd0b..3f0a692 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -2481,7 +2481,7 @@ fixup_uidnode (KBNODE uidnode, KBNODE signode, u32 keycreated) nzip = p ? n : 0; if (uid->prefs) xfree (uid->prefs); - n = nsym + nhash + nzip; + n = nsym + naead + nhash + nzip; if (!n) uid->prefs = NULL; else diff --git a/g10/key-check.c b/g10/key-check.c index c17b12c..45f384b 100644 --- a/g10/key-check.c +++ b/g10/key-check.c @@ -367,8 +367,11 @@ key_check_all_keysigs (ctrl_t ctrl, int mode, kbnode_t kb, if (only_selfsigs) continue; - issuer = xmalloc (sizeof (*issuer)); - err = get_pubkey (ctrl, issuer, sig->keyid); + issuer = xtrycalloc (1, sizeof *issuer); + if (!issuer) + err = gpg_error_from_syserror (); + else + err = get_pubkey (ctrl, issuer, sig->keyid); if (err) { xfree (issuer); |