security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-08 17:43:04 +01:00
Code Activity

* gpgkeys_ldap.c (search_key, main): Make sure LDAP values are freed in

Browse Source 
case of error.
This commit is contained in:
David Shaw 2002-10-09 02:23:46 +00:00
parent 338aab3be9
commit 63154fea49
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
keyserver/ChangeLog
View File

@ -1,5 +1,8 @@
2002-10-08 David Shaw <dshaw@jabberwocky.com> 2002-10-08 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_ldap.c (search_key, main): Make sure LDAP values are
freed in case of error.
* gpgkeys_ldap.c (main): Fix error return code. * gpgkeys_ldap.c (main): Fix error return code.
2002-09-26 Werner Koch <wk@gnupg.org> 2002-09-26 Werner Koch <wk@gnupg.org>

9
keyserver/gpgkeys_ldap.c
View File

@ -352,16 +352,18 @@ int get_key(char *getkey)
/* YYYYMMDDHHmmssZ */ /* YYYYMMDDHHmmssZ */
vals=ldap_get_values(ldap,each,"pgpkeycreatetime"); vals=ldap_get_values(ldap,each,"pgpkeycreatetime");
if(vals!=NULL && strlen(vals[0])==15) if(vals!=NULL)
{ {
if(strlen(vals[0])==15)
fprintf(console,"Key created:\t%.2s/%.2s/%.4s\n", fprintf(console,"Key created:\t%.2s/%.2s/%.4s\n",
&vals[0][4],&vals[0][6],vals[0]); &vals[0][4],&vals[0][6],vals[0]);
ldap_value_free(vals); ldap_value_free(vals);
} }
vals=ldap_get_values(ldap,each,"modifytimestamp"); vals=ldap_get_values(ldap,each,"modifytimestamp");
if(vals!=NULL && strlen(vals[0])==15) if(vals!=NULL)
{ {
if(strlen(vals[0])==15)
fprintf(console,"Key modified:\t%.2s/%.2s/%.4s\n", fprintf(console,"Key modified:\t%.2s/%.2s/%.4s\n",
&vals[0][4],&vals[0][6],vals[0]); &vals[0][4],&vals[0][6],vals[0]);
ldap_value_free(vals); ldap_value_free(vals);
@ -886,14 +888,13 @@ int main(int argc,char *argv[])
if(vals!=NULL) if(vals!=NULL)
{ {
basekeyspacedn=strdup(vals[0]); basekeyspacedn=strdup(vals[0]);
ldap_value_free(vals);
if(basekeyspacedn==NULL) if(basekeyspacedn==NULL)
{ {
fprintf(console,"gpgkeys: can't allocate string space " fprintf(console,"gpgkeys: can't allocate string space "
"for LDAP base\n"); "for LDAP base\n");
goto fail; goto fail;
} }
ldap_value_free(vals);
} }
ldap_msgfree(res); ldap_msgfree(res);