summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--legacy/ecore/src/lib/ecore_evas/ecore_evas_extn.c8
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c2
2 files changed, 10 insertions, 0 deletions
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_extn.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_extn.c
index d629ff3..c192a3a 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_extn.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_extn.c
@@ -1474,6 +1474,12 @@ ecore_evas_extn_plug_connect(Evas_Object *obj, const char *svcname, int svcnum,
1474 ee = evas_object_data_get(obj, "Ecore_Evas"); 1474 ee = evas_object_data_get(obj, "Ecore_Evas");
1475 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) return EINA_FALSE; 1475 if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) return EINA_FALSE;
1476 1476
1477 if (!svcname)
1478 {
1479 ee->engine.buffer.data = NULL;
1480 return EINA_FALSE;
1481 }
1482
1477 extn = calloc(1, sizeof(Extn)); 1483 extn = calloc(1, sizeof(Extn));
1478 if (!extn) return EINA_FALSE; 1484 if (!extn) return EINA_FALSE;
1479 1485
@@ -1489,6 +1495,7 @@ ecore_evas_extn_plug_connect(Evas_Object *obj, const char *svcname, int svcnum,
1489 extn->svc.num, ee); 1495 extn->svc.num, ee);
1490 if (!extn->ipc.server) 1496 if (!extn->ipc.server)
1491 { 1497 {
1498 ee->engine.buffer.data = NULL;
1492 eina_stringshare_del(extn->svc.name); 1499 eina_stringshare_del(extn->svc.name);
1493 free(extn); 1500 free(extn);
1494 ecore_ipc_shutdown(); 1501 ecore_ipc_shutdown();
@@ -1624,6 +1631,7 @@ _ecore_evas_extn_socket_render(Ecore_Evas *ee)
1624 Ecore_Ipc_Client *client; 1631 Ecore_Ipc_Client *client;
1625 1632
1626 extn = ee->engine.buffer.data; 1633 extn = ee->engine.buffer.data;
1634 if (!extn) return rend;
1627 EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2) 1635 EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2)
1628 { 1636 {
1629 if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2); 1637 if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2);
diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
index 9e655d3..0480001 100644
--- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
+++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
@@ -357,6 +357,8 @@ ecore_ipc_server_add(Ecore_Ipc_Type compl_type, const char *name, int port, cons
357 Ecore_Ipc_Type type; 357 Ecore_Ipc_Type type;
358 Ecore_Con_Type extra = 0; 358 Ecore_Con_Type extra = 0;
359 359
360 if (!name) return NULL;
361
360 svr = calloc(1, sizeof(Ecore_Ipc_Server)); 362 svr = calloc(1, sizeof(Ecore_Ipc_Server));
361 if (!svr) return NULL; 363 if (!svr) return NULL;
362 type = compl_type; 364 type = compl_type;