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

PackageKit: Fix a crash properly 

This reverts and tries to actually fix:

commit b30892056e
Author: Jean-Philippe Andre <jp.andre@samsung.com>
Date:   Fri Apr 17 10:30:06 2015 +0900

    PackageKit: Fix crash on error

    Sometimes a "normal" error occurs and then the callback is
    called with no context data. Then crash boom sigsegv happens.
This commit is contained in:
Jean-Philippe ANDRE 2015-04-18 17:19:00 +09:00
parent 8f4a018e18
commit 215b3b3474
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/modules/packagekit/e_mod_packagekit.c
View File

@ -220,7 +220,6 @@ static void
_store_error(E_PackageKit_Module_Context *ctxt, const char *err)
{
ERR("PKGKIT: ERROR: %s", err);
if (!ctxt) return; // see packagekit_get_updates()
if (ctxt->error)
eina_stringshare_replace(&ctxt->error, err);
else
@ -396,9 +395,9 @@ packagekit_get_updates(E_PackageKit_Module_Context *ctxt, const char *transactio
obj = eldbus_object_get(ctxt->conn, "org.freedesktop.PackageKit", transaction);
proxy = eldbus_proxy_get(obj, "org.freedesktop.PackageKit.Transaction");
if (PKITV07)
pending = eldbus_proxy_call(proxy, "GetUpdates", null_cb, NULL, -1, "s", "none");
pending = eldbus_proxy_call(proxy, "GetUpdates", null_cb, ctxt, -1, "s", "none");
else
pending = eldbus_proxy_call(proxy, "GetUpdates", null_cb, NULL, -1, "t", 1);
pending = eldbus_proxy_call(proxy, "GetUpdates", null_cb, ctxt, -1, "t", 1);
if (!pending)
{
_store_error(ctxt, "could not call GetUpdates()");