From: Zbigniew Kosinski <z.kosinski@samsung.com>

Subject: [E-devel] [EET] Check data descriptor parameter in eet_data

Right now, functions from eet_data don't check if data descriptor handle
parameter is NULL.

What do You think about adding null checks for that parameter type?

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/eet@77117 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index b324d2b..6be8b99 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -632,3 +632,9 @@
 
         * Fix big endian bug with eet image handling and endianess swapping.
 
+2012-09-27 Patryk Kaczmarek <patryk.k@samsung.com>
+
+        * Add eet file handle null checks to eet_data_write_cipher(),
+        eet_data_descriptor_decode_cipher(),
+        eet_data_descriptor_encode_cipher(), eet_data_xattr_cipher_get(),
+        eet_data_xattr_cipher_set().

diff --git a/src/lib/eet_data.c b/src/lib/eet_data.c
index d06d3ea..9c9dc8c 100644 (file)
--- a/src/lib/eet_data.c
+++ b/src/lib/eet_data.c
@@ -2149,6 +2149,8 @@ eet_data_write_cipher(Eet_File            *ef,
    int size;
    int val;
 
+   EINA_SAFETY_ON_NULL_RETURN_VAL(edd, 0);
+
    ed = eet_dictionary_get(ef);
 
    data_enc = _eet_data_descriptor_encode(ed, edd, data, &size);
@@ -4737,6 +4739,8 @@ eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd,
    Eet_Free_Context context;
    unsigned int deciphered_len = size_in;
 
+   EINA_SAFETY_ON_NULL_RETURN_VAL(edd, NULL);
+
    if (cipher_key && data_in)
      if (eet_decipher(data_in, size_in, cipher_key,
                       strlen(cipher_key), &deciphered, &deciphered_len))
@@ -4938,6 +4942,8 @@ eet_data_descriptor_encode_cipher(Eet_Data_Descriptor *edd,
    unsigned int ciphered_len = 0;
    int size;
 
+   EINA_SAFETY_ON_NULL_RETURN_VAL(edd, NULL);
+
    ret = _eet_data_descriptor_encode(NULL, edd, data_in, &size);
    if (cipher_key && ret)
      {
@@ -4983,6 +4989,8 @@ eet_data_xattr_cipher_get(const char          *filename,
    void *ret;
    ssize_t size;
 
+   EINA_SAFETY_ON_NULL_RETURN_VAL(edd, NULL);
+
    blob = eina_xattr_get(filename, attribute, &size);
    if (!blob) return NULL;
 
@@ -5004,6 +5012,8 @@ eet_data_xattr_cipher_set(const char          *filename,
    int size;
    Eina_Bool ret;
 
+   EINA_SAFETY_ON_NULL_RETURN_VAL(edd, EINA_FALSE);
+
    blob = eet_data_descriptor_encode_cipher(edd, data, cipher_key, &size);
    if (!blob) return EINA_FALSE;