From ff652084e028b3c8e8f69cf16baecbad32bb40e7 Mon Sep 17 00:00:00 2001
From: "Carsten Haitzler (Rasterman)" <raster@rasterman.com>
Date: Mon, 11 Aug 2014 20:48:03 +0900
Subject: [PATCH] fix valgrind report on ecore con server connect failure

this should fix T1508 - my testing seems to indicate so. test suite
succeeds, some manual tests of mine work. so is ay this is a good fix
that could fix critical segvs in apps using ecore-con - eg like
weather module in e
---
 src/lib/ecore_con/ecore_con.c | 65 +++++++++++++------------------------------
 1 file changed, 19 insertions(+), 46 deletions(-)

diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index 1defb80..6d1c97b 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -359,10 +359,8 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
    if (!svr)
      return NULL;
 
-   svr->name = strdup(name);
-   if (!svr->name)
-     goto error;
-
+   ECORE_MAGIC_SET(svr, ECORE_MAGIC_CON_SERVER);
+   svr->fd = -1;
    svr->start_time = ecore_time_get();
    svr->type = compl_type;
    svr->port = port;
@@ -373,6 +371,11 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
    svr->client_limit = -1;
    svr->clients = NULL;
    svr->ppid = getpid();
+
+   svr->name = strdup(name);
+   if (!svr->name)
+     goto error;
+
    if (ecore_con_ssl_server_prepare(svr, compl_type & ECORE_CON_SSL))
      goto error;
 
@@ -407,31 +410,12 @@ ecore_con_server_add(Ecore_Con_Type compl_type,
        goto error;
 
    servers = eina_list_append(servers, svr);
-   ECORE_MAGIC_SET(svr, ECORE_MAGIC_CON_SERVER);
 
    return svr;
 
 error:
-   if (svr->name)
-     free(svr->name);
-
-   if (svr->path)
-     free(svr->path);
-
-   if (svr->fd_handler)
-     ecore_main_fd_handler_del(svr->fd_handler);
-
-   if (svr->fd > 0)
-     close(svr->fd);
-
-   if (svr->buf)
-     eina_binbuf_free(svr->buf);
-
-   if (svr->ip)
-     eina_stringshare_del(svr->ip);
-
-   ecore_con_ssl_server_shutdown(svr);
-   free(svr);
+   if (svr->delete_me) return NULL;
+   _ecore_con_server_kill(svr);
    return NULL;
 }
 
@@ -453,10 +437,8 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
    if (!svr)
      return NULL;
 
-   svr->name = strdup(name);
-   if (!svr->name)
-     goto error;
-
+   ECORE_MAGIC_SET(svr, ECORE_MAGIC_CON_SERVER);
+   svr->fd = -1;
    svr->type = compl_type;
    svr->port = port;
    svr->data = (void *)data;
@@ -467,6 +449,10 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
    svr->clients = NULL;
    svr->client_limit = -1;
 
+   svr->name = strdup(name);
+   if (!svr->name)
+     goto error;
+
    type = compl_type & ECORE_CON_TYPE;
 
    if ((!svr->disable_proxy) && (type > ECORE_CON_LOCAL_ABSTRACT))
@@ -517,25 +503,12 @@ ecore_con_server_connect(Ecore_Con_Type compl_type,
      EINA_SAFETY_ON_FALSE_GOTO(ecore_con_info_udp_connect(svr, _ecore_con_cb_udp_connect, svr), error);
 
    servers = eina_list_append(servers, svr);
-   ECORE_MAGIC_SET(svr, ECORE_MAGIC_CON_SERVER);
 
    return svr;
 
 error:
-   if (svr->name)
-     free(svr->name);
-
-   if (svr->path)
-     free(svr->path);
-
-   if (svr->fd_handler)
-     ecore_main_fd_handler_del(svr->fd_handler);
-
-   if (svr->fd > 0)
-     close(svr->fd);
-
-   ecore_con_ssl_server_shutdown(svr);
-   free(svr);
+   if (svr->delete_me) return NULL;
+   _ecore_con_server_kill(svr);
    return NULL;
 }
 
@@ -1302,7 +1275,7 @@ _ecore_con_server_free(Ecore_Con_Server *svr)
    if (svr->fd_handler)
      ecore_main_fd_handler_del(svr->fd_handler);
 
-   if (svr->fd > 0)
+   if (svr->fd >= 0)
      close(svr->fd);
 
    if (svr->until_deletion)
@@ -1352,7 +1325,7 @@ _ecore_con_client_free(Ecore_Con_Client *cl)
    if (cl->fd_handler)
      ecore_main_fd_handler_del(cl->fd_handler);
 
-   if (cl->fd > 0)
+   if (cl->fd >= 0)
      close(cl->fd);
 
    free(cl->client_addr);
-- 
2.7.4