diff options
| author | Marcus Brinkmann <mb@g10code.com> | 2005-09-12 19:08:29 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <mb@g10code.com> | 2005-09-12 19:08:29 +0000 |
| commit | f9cbb43463a4f4772a53c87ead7affcacc59d08d (patch) | |
| tree | a3d73170d192ef04c76ef4ffd67f432134376201 | |
| parent | 6f3247c5834a92df5915352d0f92f1a01ccb7951 (diff) | |
| download | gpgme-f9cbb43463a4f4772a53c87ead7affcacc59d08d.tar.gz | |
2005-09-12 Marcus Brinkmann <marcus@g10code.de>gpgme-1-0-branch
* keylist.c (release_op_data): Do not free opd->tmp_uid.
| -rw-r--r-- | gpgme/ChangeLog | 4 | ||||
| -rw-r--r-- | gpgme/keylist.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index 4c0eee78..fc3c61bf 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,3 +1,7 @@ +2005-09-12 Marcus Brinkmann <marcus@g10code.de> + + * keylist.c (release_op_data): Do not free opd->tmp_uid. + 2005-07-26 Marcus Brinkmann <marcus@g10code.de> * keylist.c (gpgme_get_key): Allow key IDs. diff --git a/gpgme/keylist.c b/gpgme/keylist.c index e26ddf09..8f9cf375 100644 --- a/gpgme/keylist.c +++ b/gpgme/keylist.c @@ -48,6 +48,7 @@ typedef struct 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 @@ release_op_data (void *hook) 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; |