Fix a possible infinite loop in HTTPInput.

[cubemap] / httpinput.cpp

diff --git a/httpinput.cpp b/httpinput.cpp
index 7da8daa1d85e732be755236a780d010a82e9cd4e..301aa3f9f81ebfe5c6b5d2f519841e19ceb1bf50 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -89,14 +89,13 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
        if (err == -1) {
                log(WARNING, "[%s] Lookup of '%s' failed (%s).",
                        url.c_str(), host.c_str(), gai_strerror(err));
-               freeaddrinfo(ai);
                return -1;
        }
 
        addrinfo *base_ai = ai;
 
        // Connect to everything in turn until we have a socket.
-       while (ai && !should_stop()) {
+       for ( ; ai && !should_stop(); ai = ai->ai_next) {
                int sock = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
                if (sock == -1) {
                        // Could be e.g. EPROTONOSUPPORT. The show must go on.
@@ -154,7 +153,6 @@ int HTTPInput::lookup_and_connect(const string &host, const string &port)
                }
 
                safe_close(sock);
-               ai = ai->ai_next;
        }
 
        // Give the last one as error.