Evas: Fix some clang warnings in evas_cs2_client.c

- Invalid alloc size (typo)
- Initialized value never read (set twice)
- Potential memleak (call free(msg) in case of send error)
- Null pointer dereference (check nullity)

There are still other warnings, but I believe these are false
positives.

diff --git a/src/lib/evas/cserve2/evas_cs2_client.c b/src/lib/evas/cserve2/evas_cs2_client.c
index 7609f4b8fd111b92c083c0a680b2dd8bc0bbaf32..a1224e47462b8fcb846e2cf2a7c7c865521a6802 100644 (file)
--- a/src/lib/evas/cserve2/evas_cs2_client.c
+++ b/src/lib/evas/cserve2/evas_cs2_client.c
@@ -418,7 +418,11 @@ _server_send(void *buf, int size, Op_Callback cb, void *data)
 
 on_error:
    if (!_request_answer_required(type, NULL))
-     return EINA_FALSE;
+     {
+        free(buf);
+        return EINA_FALSE;
+     }
+
    ERR("Socket error: %d %m", errno);
    switch (errno)
      {
@@ -701,7 +705,6 @@ _image_opened_cb(void *data, const void *msg_received, int size)
           }
         else
           ERR("Invalid message type received: %d (%s)", answer->type, __FUNCTION__);
-        fentry = ie->data1;
         EINA_REFCOUNT_UNREF(fentry)
           eina_hash_del(_file_entries, fentry->hkey, fentry);
         return EINA_TRUE;
@@ -1717,7 +1720,7 @@ _glyph_map_remap_check(Glyph_Map *map, const char *idxpath, const char *datapath
         // Reopen mempool
         if (EINA_REFCOUNT_GET(&map->mempool) > 0)
           {
-             oldbuf = calloc(1, sizeof(Glyph_Map));
+             oldbuf = calloc(1, sizeof(*oldbuf));
              oldbuf->f = map->mempool.f;
              oldbuf->data = map->mempool.data;
              oldbuf->size = map->mempool.size;
@@ -1779,7 +1782,7 @@ _glyph_map_remap_check(Glyph_Map *map, const char *idxpath, const char *datapath
 
         if (EINA_REFCOUNT_GET(&map->mempool) > 0)
           {
-             oldbuf = calloc(1, sizeof(Glyph_Map));
+             oldbuf = calloc(1, sizeof(*oldbuf));
              oldbuf->f = eina_file_dup(map->mempool.f);
              oldbuf->data = map->mempool.data;
              oldbuf->size = map->mempool.size;
@@ -2644,6 +2647,9 @@ _shared_image_entry_file_data_find(Image_Entry *ie)
    if (!_index.files.header || !_index.files.entries.filedata)
      return NULL;
 
+   if (!ie->data1)
+     return NULL;
+
    // Direct access
    fe = ie->data1;
    if (fe->server_file_id)