1 files changed, 15 insertions, 17 deletions

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 114a56b74e..a2d7a37378 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -347,22 +347,20 @@ rend_service_parse_port_config(const char *string, const char *sep,
   int realport = 0;
   uint16_t p;
   tor_addr_t addr;
-  const char *addrport;
   rend_service_port_config_t *result = NULL;
   unsigned int is_unix_addr = 0;
-  char *socket_path = NULL;
+  const char *socket_path = NULL;
   char *err_msg = NULL;
+  char *addrport = NULL;
 
   sl = smartlist_new();
   smartlist_split_string(sl, string, sep,
-                         SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
-  if (smartlist_len(sl) < 1 || smartlist_len(sl) > 2) {
+                         SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 2);
+  if (smartlist_len(sl) < 1 || BUG(smartlist_len(sl) > 2)) {
     if (err_msg_out)
       err_msg = tor_strdup("Bad syntax in hidden service port configuration.");
-
     goto err;
   }
-
   virtport = (int)tor_parse_long(smartlist_get(sl,0), 10, 1, 65535, NULL,NULL);
   if (!virtport) {
     if (err_msg_out)
@@ -371,7 +369,6 @@ rend_service_parse_port_config(const char *string, const char *sep,
 
     goto err;
   }
-
   if (smartlist_len(sl) == 1) {
     /* No addr:port part; use default. */
     realport = virtport;
@@ -379,17 +376,18 @@ rend_service_parse_port_config(const char *string, const char *sep,
   } else {
     int ret;
 
-    addrport = smartlist_get(sl,1);
-    ret = config_parse_unix_port(addrport, &socket_path);
-    if (ret < 0 && ret != -ENOENT) {
-      if (ret == -EINVAL)
-        if (err_msg_out)
-          err_msg = tor_strdup("Empty socket path in hidden service port "
-                               "configuration.");
-
+    const char *addrport_element = smartlist_get(sl,1);
+    const char *rest = NULL;
+    int is_unix;
+    ret = port_cfg_line_extract_addrport(addrport_element, &addrport,
+                                         &is_unix, &rest);
+    if (ret < 0) {
+      tor_asprintf(&err_msg, "Couldn't process address <%s> from hidden service "
+                   "configuration", addrport_element);
       goto err;
     }
-    if (socket_path) {
+    if (is_unix) {
+      socket_path = addrport;
       is_unix_addr = 1;
     } else if (strchr(addrport, ':') || strchr(addrport, '.')) {
       /* else try it as an IP:port pair if it has a : or . in it */
@@ -427,10 +425,10 @@ rend_service_parse_port_config(const char *string, const char *sep,
   }
 
  err:
+  tor_free(addrport);
   if (err_msg_out) *err_msg_out = err_msg;
   SMARTLIST_FOREACH(sl, char *, c, tor_free(c));
   smartlist_free(sl);
-  if (socket_path) tor_free(socket_path);
 
   return result;
 }