From: Marcus Brinkmann <mb@g10code.com>
Date: Tue, 24 Oct 2006 09:22:33 +0000 (+0000)
Subject: 2006-10-24  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: gpgme-1.2.0@1385~199
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=17132419da7f517b013a9759731f1d48fe6b59f6;p=gpgme.git

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 f3b78b5..b773ef9 100644
--- 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 f33860a..e8cdb66 100644
--- 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)
     {