jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=215b3b3474817d8c781c5f6eb5ed562523e69684

commit 215b3b3474817d8c781c5f6eb5ed562523e69684
Author: Jean-Philippe ANDRE <j...@videolan.org>
Date:   Sat Apr 18 17:19:00 2015 +0900

    PackageKit: Fix a crash properly
    
    This reverts and tries to actually fix:
    
    commit b30892056e0a527545c8a022cd2b3cdef0ec85af
    Author: Jean-Philippe Andre <jp.an...@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.
---
 src/modules/packagekit/e_mod_packagekit.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/modules/packagekit/e_mod_packagekit.c 
b/src/modules/packagekit/e_mod_packagekit.c
index 051d620..d1b1f1d 100644
--- a/src/modules/packagekit/e_mod_packagekit.c
+++ b/src/modules/packagekit/e_mod_packagekit.c
@@ -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()");

-- 


Reply via email to