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

	* trustlist.c (gpgme_op_trustlist_next): Return error if OPD is
	NULL.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index f3b78b5b2181fea69a8e3f2bf383ea0312fde9b5..b773ef9475b0040f4a21e6dcb95b320eda2cd9fe 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-24  Marcus Brinkmann  <marcus@g10code.de>
+
+       * trustlist.c (gpgme_op_trustlist_next): Return error if OPD is
+       NULL.
+
 2006-10-23  Marcus Brinkmann  <marcus@g10code.de>
 
        * wait-global.c (gpgme_wait): Unlock CTX_LIST_LOCK while calling

diff --git a/trunk/gpgme/trustlist.c b/trunk/gpgme/trustlist.c
index f33860a426b1c13b151d8b4ab629975539fe912d..e8cdb66e5eea3588f807e2263bd8f91b90314d05 100644 (file)
--- a/trunk/gpgme/trustlist.c
+++ b/trunk/gpgme/trustlist.c
@@ -215,6 +215,8 @@ gpgme_op_trustlist_next (gpgme_ctx_t ctx, gpgme_trust_item_t *r_item)
   opd = hook;
   if (err)
     return err;
+  if (opd == NULL)
+    return gpg_error (GPG_ERR_INV_VALUE);
 
   if (!opd->trust_queue)
     {