diff options
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/ftpd/ftpd.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 4689136aeea2b..9e169d4cdfd9b 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -783,12 +783,12 @@ inithosts(void) if ((hrp = malloc(sizeof(struct ftphost))) == NULL) goto nextline; hrp->hostname = NULL; - hrp->hostinfo = NULL; insert = 1; - } else + } else { + if (hrp->hostinfo) + freeaddrinfo(hrp->hostinfo); insert = 0; /* host already in the chain */ - if (hrp->hostinfo) - freeaddrinfo(hrp->hostinfo); + } hrp->hostinfo = res; /* @@ -808,9 +808,11 @@ inithosts(void) break; default: /* should not reach here */ - if (hrp->hostinfo != NULL) - freeaddrinfo(hrp->hostinfo); - free(hrp); + freeaddrinfo(hrp->hostinfo); + if (insert) + free(hrp); /*not in chain, can free*/ + else + hrp->hostinfo = NULL; /*mark as blank*/ goto nextline; /* NOTREACHED */ } @@ -836,8 +838,13 @@ inithosts(void) hrp->hostname = NULL; } if (hrp->hostname == NULL && - (hrp->hostname = strdup(vhost)) == NULL) + (hrp->hostname = strdup(vhost)) == NULL) { + freeaddrinfo(hrp->hostinfo); + hrp->hostinfo = NULL; /* mark as blank */ + if (hp) + freehostent(hp); goto nextline; + } hrp->anonuser = anonuser; hrp->statfile = statfile; hrp->welcome = welcome; |