summaryrefslogtreecommitdiff
path: root/src/lib/eet
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2012-10-05 06:35:06 +0000
committerDaniel Juyung Seo <seojuyung2@gmail.com>2012-10-05 06:35:06 +0000
commit91f0f4ee8ecbdff38c7315d1093707ab438d2bfd (patch)
treed349d518a2ce9aaecf7dd29b731ed844e35d7f1a /src/lib/eet
parent248fb9b2d99b8b6f211b7dd72dd2f6840d2e9fd7 (diff)
backport r77494 and r77495.
SVN revision: 77498
Diffstat (limited to 'src/lib/eet')
-rw-r--r--src/lib/eet/eet_connection.c4
-rw-r--r--src/lib/eet/eet_data.c2
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,
185 int data_size; 185 int data_size;
186 Eina_Bool ret = EINA_FALSE; 186 Eina_Bool ret = EINA_FALSE;
187 187
188 EINA_SAFETY_ON_NULL_RETURN_VAL(conn, EINA_FALSE);
189
188 flat_data = eet_data_descriptor_encode_cipher(edd, 190 flat_data = eet_data_descriptor_encode_cipher(edd,
189 data_in, 191 data_in,
190 cipher_key, 192 cipher_key,
@@ -204,6 +206,8 @@ eet_connection_node_send(Eet_Connection *conn,
204 int data_size; 206 int data_size;
205 Eina_Bool ret = EINA_FALSE; 207 Eina_Bool ret = EINA_FALSE;
206 208
209 EINA_SAFETY_ON_NULL_RETURN_VAL(conn, EINA_FALSE);
210
207 data = eet_data_node_encode_cipher(node, cipher_key, &data_size); 211 data = eet_data_node_encode_cipher(node, cipher_key, &data_size);
208 if (!data) return EINA_FALSE; 212 if (!data) return EINA_FALSE;
209 if (_eet_connection_raw_send(conn, data, data_size)) 213 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,
1943 Eet_Data_Element *ede; 1943 Eet_Data_Element *ede;
1944 Eet_Data_Element *tmp; 1944 Eet_Data_Element *tmp;
1945 1945
1946 EINA_SAFETY_ON_NULL_RETURN(edd);
1947
1946 /* Sanity check to avoid crash later at runtime */ 1948 /* Sanity check to avoid crash later at runtime */
1947 if (type < EET_T_UNKNOW || 1949 if (type < EET_T_UNKNOW ||
1948 type >= EET_T_LAST) 1950 type >= EET_T_LAST)