Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_ipc
Modified Files:
Tag: SPLIT
ecore_ipc.c
Log Message:
and check all parameters/handles/magic numbers
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_ipc/Attic/ecore_ipc.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -3 -r1.1.2.4 -r1.1.2.5
--- ecore_ipc.c 8 Aug 2003 02:54:50 -0000 1.1.2.4
+++ ecore_ipc.c 8 Aug 2003 03:33:06 -0000 1.1.2.5
@@ -125,6 +125,7 @@
}
svr->data = (void *)data;
servers = _ecore_list_append(servers, svr);
+ ECORE_MAGIC_SET(svr, ECORE_MAGIC_IPC_SERVER);
return svr;
}
@@ -163,6 +164,7 @@
}
svr->data = (void *)data;
servers = _ecore_list_append(servers, svr);
+ ECORE_MAGIC_SET(svr, ECORE_MAGIC_IPC_SERVER);
return svr;
}
@@ -176,7 +178,13 @@
ecore_ipc_server_del(Ecore_Ipc_Server *svr)
{
void *data;
-
+
+ if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_IPC_SERVER))
+ {
+ ECORE_MAGIC_FAIL(svr, ECORE_MAGIC_IPC_SERVER,
+ "ecore_ipc_server_del");
+ return NULL;
+ }
data = svr->data;
while (svr->clients) ecore_ipc_client_del((Ecore_Ipc_Client *)svr->clients);
ecore_con_server_del(svr->server);
@@ -195,6 +203,12 @@
void *
ecore_ipc_server_data_get(Ecore_Ipc_Server *svr)
{
+ if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_IPC_SERVER))
+ {
+ ECORE_MAGIC_FAIL(svr, ECORE_MAGIC_IPC_SERVER,
+ "ecore_ipc_server_data_get");
+ return NULL;
+ }
return svr->data;
}
@@ -207,6 +221,12 @@
int
ecore_ipc_server_connected_get(Ecore_Ipc_Server *svr)
{
+ if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_IPC_SERVER))
+ {
+ ECORE_MAGIC_FAIL(svr, ECORE_MAGIC_IPC_SERVER,
+ "ecore_ipc_server_connected_get");
+ return 0;
+ }
return ecore_con_server_connected_get(svr->server);
}
@@ -222,6 +242,12 @@
Ecore_Ipc_Msg_Head msg;
int ret;
+ if (!ECORE_MAGIC_CHECK(svr, ECORE_MAGIC_IPC_SERVER))
+ {
+ ECORE_MAGIC_FAIL(svr, ECORE_MAGIC_IPC_SERVER,
+ "ecore_ipc_server_send");
+ return 0;
+ }
msg.major = htonl(major);
msg.minor = htonl(minor);
msg.ref = htonl(ref);
@@ -245,6 +271,12 @@
Ecore_Ipc_Msg_Head msg;
int ret;
+ if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_IPC_CLIENT))
+ {
+ ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_IPC_CLIENT,
+ "ecore_ipc_client_send");
+ return 0;
+ }
msg.major = htonl(major);
msg.minor = htonl(minor);
msg.ref = htonl(ref);
@@ -265,6 +297,12 @@
Ecore_Ipc_Server *
ecore_ipc_client_server_get(Ecore_Ipc_Client *cl)
{
+ if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_IPC_CLIENT))
+ {
+ ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_IPC_CLIENT,
+ "ecore_ipc_client_server_get");
+ return NULL;
+ }
return (ecore_con_server_data_get(ecore_con_client_server_get(cl->client)));
}
@@ -280,6 +318,12 @@
void *data;
Ecore_Ipc_Server *svr;
+ if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_IPC_CLIENT))
+ {
+ ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_IPC_CLIENT,
+ "ecore_ipc_client_del");
+ return NULL;
+ }
data = cl->data;
svr = ecore_con_server_data_get(ecore_con_client_server_get(cl->client));
ecore_con_client_del(cl->client);
@@ -298,6 +342,12 @@
void
ecore_ipc_client_data_set(Ecore_Ipc_Client *cl, const void *data)
{
+ if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_IPC_CLIENT))
+ {
+ ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_IPC_CLIENT,
+ "ecore_ipc_client_data_set");
+ return;
+ }
cl->data = (void *)data;
}
@@ -310,6 +360,12 @@
void *
ecore_ipc_client_data_get(Ecore_Ipc_Client *cl)
{
+ if (!ECORE_MAGIC_CHECK(cl, ECORE_MAGIC_IPC_CLIENT))
+ {
+ ECORE_MAGIC_FAIL(cl, ECORE_MAGIC_IPC_CLIENT,
+ "ecore_ipc_client_data_get");
+ return NULL;
+ }
return cl->data;
}
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
