backport r77494 and r77495.

SVN revision: 77498

2 files changed, 6 insertions, 0 deletions

diff --git a/src/lib/eet/eet_connection.c b/src/lib/eet/eet_connection.c
index c044e3d11a..a192d4e917 100644
--- a/src/lib/eet/eet_connection.c
+++ b/src/lib/eet/eet_connection.c
@@ -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))
diff --git a/src/lib/eet/eet_data.c b/src/lib/eet/eet_data.c
index 9c9dc8ceec..f995353161 100644
--- a/src/lib/eet/eet_data.c
+++ b/src/lib/eet/eet_data.c
@@ -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)