From 3f0afb2644a89b239606c4af15e7b880f4be0573 Mon Sep 17 00:00:00 2001 From: Artem Popov Date: Wed, 16 Nov 2016 15:30:29 -0800 Subject: [PATCH] eet: add NULL-check to eet_connection_empty API to avoid segfault @fix Summary: Only eet_connection_empty hasn't checking on NULL and try to read from field of object. Add NULL-check for connection and return result of empty connection. Reviewers: jpeg, cedric, myoungwoon Subscribers: t.naumenko, NikaWhite Differential Revision: https://phab.enlightenment.org/D4399 Change-Id: Ia080d4bb4b38a61377381977a159cb0e260055ea Signed-off-by: Cedric BAIL --- src/lib/eet/eet_connection.c | 1 + src/lib/eet/eet_data.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/lib/eet/eet_connection.c b/src/lib/eet/eet_connection.c index 7945692..735e112 100644 --- a/src/lib/eet/eet_connection.c +++ b/src/lib/eet/eet_connection.c @@ -157,6 +157,7 @@ _eet_connection_raw_send(Eet_Connection *conn, EAPI Eina_Bool eet_connection_empty(Eet_Connection *conn) { + EINA_SAFETY_ON_NULL_RETURN_VAL(conn, EINA_TRUE); return conn->size ? EINA_FALSE : EINA_TRUE; } diff --git a/src/lib/eet/eet_data.c b/src/lib/eet/eet_data.c index 1c42393..02be40b 100644 --- a/src/lib/eet/eet_data.c +++ b/src/lib/eet/eet_data.c @@ -5273,6 +5273,7 @@ eet_data_descriptor_encode_cipher(Eet_Data_Descriptor *edd, int size; EINA_SAFETY_ON_NULL_RETURN_VAL(edd, NULL); + EINA_SAFETY_ON_NULL_RETURN_VAL(data_in, NULL); ret = _eet_data_descriptor_encode(NULL, edd, data_in, &size); if (cipher_key && ret) -- 2.7.4