2006-10-23 Marcus Brinkmann <marcus@g10code.de>

	* keylist.c (gpgme_op_keylist_next): Return error if OPD is NULL.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index 6f27890b54bf4db54ded33f6d78e8d50a901ffed..9dce5958a97470254da29256991c75208e2d3263 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-23  Marcus Brinkmann  <marcus@g10code.de>
+
+       * keylist.c (gpgme_op_keylist_next): Return error if OPD is NULL.
+
 2006-09-25  Marcus Brinkmann  <marcus@g10code.de>
 
        * data-mem.c (gpgme_data_release_and_get_mem): Release the data

diff --git a/trunk/gpgme/keylist.c b/trunk/gpgme/keylist.c
index 8e3fefe450454fb4f2c65c682199eb08799789b0..1c60da5cf7916538455644f7a7dfaff7acd3b820 100644 (file)
--- a/trunk/gpgme/keylist.c
+++ b/trunk/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)
     {