aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2006-10-23 17:17:25 +0000
committerMarcus Brinkmann <[email protected]>2006-10-23 17:17:25 +0000
commitaeef0402a7469d9ade74751cdbdf12a277c4304e (patch)
treeecad265ff452ec54766d6c01601ae58bd21b29d5
parentdoc/ (diff)
downloadgpgme-aeef0402a7469d9ade74751cdbdf12a277c4304e.tar.gz
gpgme-aeef0402a7469d9ade74751cdbdf12a277c4304e.zip
2006-10-23 Marcus Brinkmann <[email protected]>
* keylist.c (gpgme_op_keylist_next): Return error if OPD is NULL.
-rw-r--r--gpgme/ChangeLog4
-rw-r--r--gpgme/keylist.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 6f27890b..9dce5958 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-23 Marcus Brinkmann <[email protected]>
+
+ * keylist.c (gpgme_op_keylist_next): Return error if OPD is NULL.
+
2006-09-25 Marcus Brinkmann <[email protected]>
* data-mem.c (gpgme_data_release_and_get_mem): Release the data
diff --git a/gpgme/keylist.c b/gpgme/keylist.c
index 8e3fefe4..1c60da5c 100644
--- a/gpgme/keylist.c
+++ b/gpgme/keylist.c
@@ -883,6 +883,8 @@ gpgme_op_keylist_next (gpgme_ctx_t ctx, gpgme_key_t *r_key)
opd = hook;
if (err)
return err;
+ if (opd == NULL)
+ return gpg_error (GPG_ERR_INV_VALUE);
if (!opd->key_queue)
{