]> source.dussan.org Git - rspamd.git/commitdiff
Another fix for parse host/port.
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 18 Aug 2014 14:33:09 +0000 (15:33 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 18 Aug 2014 14:33:09 +0000 (15:33 +0100)
src/libserver/cfg_utils.c

index 7b981d1dce78cfcea0bd0d7de33e4f896fb3e9e1..04e59010596f614933d12c993738a4e4bad44254 100644 (file)
@@ -113,20 +113,22 @@ parse_host_port_priority_strv (rspamd_mempool_t *pool, gchar **tokens,
                        }
                }
                if (priority != NULL) {
+                       const gchar *tok;
+
                        if (port != NULL) {
-                               cur_tok = tokens[2];
+                               tok = tokens[2];
                        }
                        else {
-                               cur_tok = tokens[1];
+                               tok = tokens[1];
                        }
-                       if (cur_tok != NULL) {
+                       if (tok != NULL) {
                                /* Priority part */
                                errno = 0;
-                               priority_parsed = strtoul (cur_tok, &err_str, 10);
+                               priority_parsed = strtoul (tok, &err_str, 10);
                                if (*err_str != '\0' || errno != 0) {
                                        msg_warn (
                                                "cannot parse priority: %s, at symbol %c, error: %s",
-                                               tokens[1],
+                                               tok,
                                                *err_str,
                                                strerror (errno));
                                }
@@ -144,7 +146,7 @@ parse_host_port_priority_strv (rspamd_mempool_t *pool, gchar **tokens,
                cur_port = NULL;
        }
 
-       if ((r = getaddrinfo (tokens[0], cur_port, &hints, &res)) == 0) {
+       if ((r = getaddrinfo (cur_tok, cur_port, &hints, &res)) == 0) {
                memcpy (&addr_holder, res->ai_addr,
                        MIN (sizeof (addr_holder), res->ai_addrlen));
                if (res->ai_family == AF_INET) {