From 2e0ce7d97f0de998cdf8e95e17ce169b7cae91cd Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 24 Jun 2009 14:03:09 +0000 Subject: Fixed a bunch of little bugs as reported by Fabian Keil. Still one problem left; marked with a gcc #warning. --- keyserver/ChangeLog | 5 +++++ keyserver/gpgkeys_ldap.c | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'keyserver') diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 2b69ccd56..d09152e46 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,8 @@ +2009-06-24 Werner Koch + + * gpgkeys_ldap.c (send_key): Do not deep free a NULL modlist. + Reported by Fabian Keil. + 2009-05-28 David Shaw From 1.4: diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c index 3fed8c590..bd8523466 100644 --- a/keyserver/gpgkeys_ldap.c +++ b/keyserver/gpgkeys_ldap.c @@ -771,14 +771,16 @@ send_key(int *r_eof) ret=KEYSERVER_OK; fail: - /* Unwind and free the whole modlist structure */ - for(ml=modlist;*ml;ml++) + if (modlist) { - free_mod_values(*ml); - free(*ml); + /* Unwind and free the whole modlist structure */ + for(ml=modlist;*ml;ml++) + { + free_mod_values(*ml); + free(*ml); + } + free(modlist); } - - free(modlist); free(addlist); free(dn); free(key); -- cgit v1.2.3