kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix ethumb client segv's i've been hunting...

This commit is contained in:
Carsten Haitzler 2013-08-27 17:20:25 +09:00
parent 33372313a1
commit d573133ff8
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/lib/ethumb_client/ethumb_client.c
View File

@ -205,11 +205,16 @@ _ethumb_client_free(Ethumb_Client *client)
EINA_LIST_FREE(client->pending_add, data) EINA_LIST_FREE(client->pending_add, data)
{ {
struct _ethumb_pending_add *pending = data; struct _ethumb_pending_add *pending = data;
pending->client = NULL;
if (pending->pending_call) if (pending->pending_call)
eldbus_pending_cancel(pending->pending_call); {
eldbus_pending_cancel(pending->pending_call);
pending->client = NULL;
}
else else
free(pending); {
pending->client = NULL;
free(pending);
}
} }
EINA_LIST_FREE(client->pending_gen, data) EINA_LIST_FREE(client->pending_gen, data)
@ -229,11 +234,16 @@ _ethumb_client_free(Ethumb_Client *client)
struct _ethumb_pending_remove *pending = data; struct _ethumb_pending_remove *pending = data;
if (pending->free_data) if (pending->free_data)
pending->free_data(pending->data); pending->free_data(pending->data);
pending->client = NULL;
if (pending->pending_call) if (pending->pending_call)
eldbus_pending_cancel(pending->pending_call); {
eldbus_pending_cancel(pending->pending_call);
pending->client = NULL;
}
else else
free(pending); {
pending->client = NULL;
free(pending);
}
} }
if (client->old_ethumb_conf) if (client->old_ethumb_conf)
@ -937,7 +947,7 @@ _ethumb_client_queue_add_cb(void *data, const Eldbus_Message *msg, Eldbus_Pendin
pending->pending_call = NULL; pending->pending_call = NULL;
if (!client) goto end; if (!client) goto end;
client->pending_add = eina_list_remove(client->pending_add, pending); client->pending_add = eina_list_remove(client->pending_add, pending);
if (eldbus_message_error_get(msg, &errname, &errmsg)) if (eldbus_message_error_get(msg, &errname, &errmsg))
{ {
ERR("Error: %s %s", errname, errmsg); ERR("Error: %s %s", errname, errmsg);
@ -950,6 +960,7 @@ _ethumb_client_queue_add_cb(void *data, const Eldbus_Message *msg, Eldbus_Pendin
goto end; goto end;
} }
generating = calloc(1, sizeof(*generating)); generating = calloc(1, sizeof(*generating));
generating->id = id; generating->id = id;
generating->file = pending->file; generating->file = pending->file;
@ -1002,10 +1013,11 @@ _ethumb_client_queue_add(Ethumb_Client *client, const char *file, const char *ke
_ethumb_client_dbus_append_bytearray(main_itr, thumb); _ethumb_client_dbus_append_bytearray(main_itr, thumb);
_ethumb_client_dbus_append_bytearray(main_itr, thumb_key); _ethumb_client_dbus_append_bytearray(main_itr, thumb_key);
client->pending_add = eina_list_append(client->pending_add, pending);
pending->pending_call = eldbus_proxy_send(client->proxy, msg, pending->pending_call = eldbus_proxy_send(client->proxy, msg,
_ethumb_client_queue_add_cb, _ethumb_client_queue_add_cb,
pending, -1); pending, -1);
client->pending_add = eina_list_append(client->pending_add, pending);
return pending->id; return pending->id;
} }
@ -1099,7 +1111,8 @@ ethumb_client_generate_cancel(Ethumb_Client *client, int id, Ethumb_Client_Gener
l = l->next; l = l->next;
continue; continue;
} }
eldbus_pending_cancel(pending_add->pending_call); if (pending_add->pending_call)
eldbus_pending_cancel(pending_add->pending_call);
pending_add->pending_call = NULL; pending_add->pending_call = NULL;
found = 1; found = 1;
break; break;