diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-07-31 03:07:24 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-07-31 13:13:26 +1000 |
| commit | 1a66079c0669813306cc69e5776a4acd9fb49015 (patch) | |
| tree | 892eb2fcddac9189cc1d8e7a9b821bde27ba1014 /addrmatch.c | |
| parent | 87f08be054b7eeadbb9cdeb3fb4872be79ccf218 (diff) | |
| download | openssh-git-1a66079c0669813306cc69e5776a4acd9fb49015.tar.gz | |
upstream: fix some memory leaks spotted by Coverity via Jakub Jelen
in bz#2366 feedback and ok dtucker@
OpenBSD-Commit-ID: 8402bbae67d578bedbadb0ce68ff7c5a136ef563
Diffstat (limited to 'addrmatch.c')
| -rw-r--r-- | addrmatch.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/addrmatch.c b/addrmatch.c index 8658e105..5a402d06 100644 --- a/addrmatch.c +++ b/addrmatch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: addrmatch.c,v 1.13 2016/09/21 16:55:42 djm Exp $ */ +/* $OpenBSD: addrmatch.c,v 1.14 2018/07/31 03:07:24 djm Exp $ */ /* * Copyright (c) 2004-2008 Damien Miller <djm@mindrot.org> @@ -205,25 +205,24 @@ addr_cmp(const struct xaddr *a, const struct xaddr *b) static int addr_pton(const char *p, struct xaddr *n) { - struct addrinfo hints, *ai; + struct addrinfo hints, *ai = NULL; + int ret = -1; memset(&hints, '\0', sizeof(hints)); hints.ai_flags = AI_NUMERICHOST; if (p == NULL || getaddrinfo(p, NULL, &hints, &ai) != 0) - return -1; - + goto out; if (ai == NULL || ai->ai_addr == NULL) - return -1; - - if (n != NULL && - addr_sa_to_xaddr(ai->ai_addr, ai->ai_addrlen, n) == -1) { + goto out; + if (n != NULL && addr_sa_to_xaddr(ai->ai_addr, ai->ai_addrlen, n) == -1) + goto out; + /* success */ + ret = 0; + out: + if (ai != NULL) freeaddrinfo(ai); - return -1; - } - - freeaddrinfo(ai); - return 0; + return ret; } /* |