[svn] gpgme - r1095 - branches/gpgme-1-0-branch/gpgme

[svn author marcus]

Author: marcus
Date: 2005-09-12 21:08:29 +0200 (Mon, 12 Sep 2005)
New Revision: 1095

Modified:
   branches/gpgme-1-0-branch/gpgme/ChangeLog
   branches/gpgme-1-0-branch/gpgme/keylist.c
Log:
2005-09-12  Marcus Brinkmann  <marcus at g10code.de>

	* keylist.c (release_op_data): Do not free opd->tmp_uid.


Modified: branches/gpgme-1-0-branch/gpgme/ChangeLog
===================================================================
--- branches/gpgme-1-0-branch/gpgme/ChangeLog	2005-09-12 19:06:45 UTC (rev 1094)
+++ branches/gpgme-1-0-branch/gpgme/ChangeLog	2005-09-12 19:08:29 UTC (rev 1095)
@@ -1,3 +1,7 @@
+2005-09-12  Marcus Brinkmann  <marcus at g10code.de>
+
+	* keylist.c (release_op_data): Do not free opd->tmp_uid.
+
 2005-07-26  Marcus Brinkmann  <marcus at g10code.de>
 
 	* keylist.c (gpgme_get_key): Allow key IDs.

Modified: branches/gpgme-1-0-branch/gpgme/keylist.c
===================================================================
--- branches/gpgme-1-0-branch/gpgme/keylist.c	2005-09-12 19:06:45 UTC (rev 1094)
+++ branches/gpgme-1-0-branch/gpgme/keylist.c	2005-09-12 19:08:29 UTC (rev 1095)
@@ -48,6 +48,7 @@
   struct _gpgme_op_keylist_result result;
 
   gpgme_key_t tmp_key;
+  /* This points to the last uid in tmp_key.  */
   gpgme_user_id_t tmp_uid;
   /* Something new is available.  */
   int key_cond;
@@ -63,8 +64,9 @@
 
   if (opd->tmp_key)
     gpgme_key_unref (opd->tmp_key);
-  if (opd->tmp_uid)
-    free (opd->tmp_uid);
+  /* opd->tmp_uid is actually part of opd->tmp_key, so we do not need
+     to release it here.  */
+
   while (key)
     {
       struct key_queue_item_s *next = key->next;