diff options
author | Werner Koch <[email protected]> | 2015-03-16 12:40:34 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2015-03-16 12:40:34 +0000 |
commit | 8cfcdfe5564f87362e5ec1bfdca5c14aed9c45f0 (patch) | |
tree | d2b904fa47d629b41a713756589a41f2e8e824b6 /src/signers.c | |
parent | Fix one byte too short malloc. (diff) | |
download | gpgme-8cfcdfe5564f87362e5ec1bfdca5c14aed9c45f0.tar.gz gpgme-8cfcdfe5564f87362e5ec1bfdca5c14aed9c45f0.zip |
Fix potential crash in trace macro.
* src/signers.c (gpgme_signers_add): Avoid deref of a NULL KEY in the
trace macro.
* src/engine-spawn.c (engspawn_release): Remove always true condition.
* src/engine-gpg.c (gpg_release): Ditto.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'src/signers.c')
-rw-r--r-- | src/signers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/signers.c b/src/signers.c index f43fafc7..f540d700 100644 --- a/src/signers.c +++ b/src/signers.c @@ -66,7 +66,7 @@ gpgme_error_t gpgme_signers_add (gpgme_ctx_t ctx, const gpgme_key_t key) { TRACE_BEG2 (DEBUG_CTX, "gpgme_signers_add", ctx, - "key=%p (%s)", key, (key->subkeys && key->subkeys->fpr) ? + "key=%p (%s)", key, (key && key->subkeys && key->subkeys->fpr) ? key->subkeys->fpr : "invalid"); if (!ctx || !key) |