1
0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00

properly free data returned by aprintf(), and bring back the code to be

independent of libssh2 version as the client code isn't really meant to adapt
to such build-time constraints.
This commit is contained in:
Daniel Stenberg 2009-07-25 18:09:57 +00:00
parent 7dc48e57a6
commit 240bfaa69e

View File

@ -4694,19 +4694,19 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
my_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE); my_setopt(curl, CURLOPT_SSL_VERIFYPEER, FALSE);
my_setopt(curl, CURLOPT_SSL_VERIFYHOST, 1); my_setopt(curl, CURLOPT_SSL_VERIFYHOST, 1);
} }
#ifdef HAVE_LIBSSH2_KNOWNHOST_API
else { else {
char *home = homedir(); char *home = homedir();
char *file = aprintf("%s/%sssh/known_hosts", home, DOT_CHAR); char *file = aprintf("%s/%sssh/known_hosts", home, DOT_CHAR);
if(home && file) { if(home)
free(home); free(home);
if(file) {
my_setopt_str(curl, CURLOPT_SSH_KNOWNHOSTS, file); my_setopt_str(curl, CURLOPT_SSH_KNOWNHOSTS, file);
/* XXX do we need to free file here? */ curl_free(file);
} }
else else
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
} }
#endif
if(config->no_body || config->remote_time) { if(config->no_body || config->remote_time) {
/* no body or use remote time */ /* no body or use remote time */