diff options
Diffstat (limited to 'keyserver')
| -rw-r--r-- | keyserver/ChangeLog | 5 | ||||
| -rw-r--r-- | keyserver/gpgkeys_ldap.c | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index b1622c3ce..186e74f21 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,8 @@ +2009-06-24 Werner Koch <[email protected]> + + * gpgkeys_ldap.c (send_key): Do not loop over a NULL modlist in + fail. Reported by Fabian Keil. + 2009-06-09 David Shaw <[email protected]> * Makefile.am (gpgkeys_hkp_LDADD): Need DNSLIBS for the resolver diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c index 17b585f84..4430ccbe1 100644 --- a/keyserver/gpgkeys_ldap.c +++ b/keyserver/gpgkeys_ldap.c @@ -777,13 +777,16 @@ send_key(int *eof) fail: /* Unwind and free the whole modlist structure */ - for(ml=modlist;*ml;ml++) + if (modlist) { - free_mod_values(*ml); - free(*ml); + for(ml=modlist;*ml;ml++) + { + free_mod_values(*ml); + free(*ml); + } + free(modlist); } - free(modlist); free(addlist); free(dn); free(key); |