From b5a6d20a6eb226ff56839a5fdd81c5dfe0adbabf Mon Sep 17 00:00:00 2001 From: henri Date: Tue, 8 Jul 2014 17:50:51 +0000 Subject: [PATCH] Fail early when unable to properly resolve proxy names. Some errors were not properly propagated. Ensure proxy_resolve() returns a negative error code and make the caller fatal() when unable to complete proxy_chain initialization for whatever reason. --- nsock/src/nsock_proxy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nsock/src/nsock_proxy.c b/nsock/src/nsock_proxy.c index 1dec91e52..fae2f490d 100644 --- a/nsock/src/nsock_proxy.c +++ b/nsock/src/nsock_proxy.c @@ -368,7 +368,7 @@ static struct proxy_node *proxy_node_new(char *proxystr) { break; if (pspec->ops->node_new(&proxy, &uri) < 0) - proxy = NULL; + fatal("Cannot initialize proxy node %s", proxystr); uri_free(&uri); @@ -455,7 +455,7 @@ int proxy_resolve(const char *host, struct sockaddr *addr, size_t *addrlen) { rc = getaddrinfo(host, NULL, NULL, &res); if (rc) - return -rc; + return -abs(rc); *addr = *res->ai_addr; *addrlen = res->ai_addrlen;