backport r77494 and r77495.

SVN revision: 77498
This commit is contained in:
Daniel Juyung Seo 2012-10-05 06:35:06 +00:00
parent 248fb9b2d9
commit 91f0f4ee8e
2 changed files with 6 additions and 0 deletions

View File

@ -185,6 +185,8 @@ eet_connection_send(Eet_Connection *conn,
int data_size;
Eina_Bool ret = EINA_FALSE;
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, EINA_FALSE);
flat_data = eet_data_descriptor_encode_cipher(edd,
data_in,
cipher_key,
@ -204,6 +206,8 @@ eet_connection_node_send(Eet_Connection *conn,
int data_size;
Eina_Bool ret = EINA_FALSE;
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, EINA_FALSE);
data = eet_data_node_encode_cipher(node, cipher_key, &data_size);
if (!data) return EINA_FALSE;
if (_eet_connection_raw_send(conn, data, data_size))

View File

@ -1943,6 +1943,8 @@ eet_data_descriptor_element_add(Eet_Data_Descriptor *edd,
Eet_Data_Element *ede;
Eet_Data_Element *tmp;
EINA_SAFETY_ON_NULL_RETURN(edd);
/* Sanity check to avoid crash later at runtime */
if (type < EET_T_UNKNOW ||
type >= EET_T_LAST)