Fix NULL dereference issue

Change-Id: I1251f1ab6e7cadad3d1036d1a1859b0803b5d837

diff --git a/packaging/tel-plugin-packetservice.spec b/packaging/tel-plugin-packetservice.spec
index adc95bb..50f9a02 100644 (file)
--- a/packaging/tel-plugin-packetservice.spec
+++ b/packaging/tel-plugin-packetservice.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 3
-%define patchlevel 35
+%define patchlevel 36
 
 Name:           tel-plugin-packetservice
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/ps_context.c b/src/ps_context.c
index bf859a5..e896109 100644 (file)
--- a/src/ps_context.c
+++ b/src/ps_context.c
@@ -2433,7 +2433,7 @@ gboolean _ps_context_set_connected(gpointer object, gboolean enabled)
        gboolean b_roaming_checker = TRUE;
        gboolean data_allowed = FALSE;
        gboolean b_mms_checker = FALSE;
-       gboolean b_ims_checker = TRUE;
+       gboolean b_ims_checker = FALSE;
 
        enum co_context_role role = CONTEXT_ROLE_UNKNOWN;
 
@@ -2529,6 +2529,10 @@ gboolean _ps_context_set_connected(gpointer object, gboolean enabled)
                        g_free(context->remove_profile_cb_data);
                        context->remove_profile_cb_data = NULL;
 
+                       if (service == NULL) {
+                               err("service is NULL");
+                               goto EXIT;
+                       }
                        /* Remove context */
                        _ps_service_unref_context(service, context);
                        service->contexts = g_slist_remove(service->contexts, context);

diff --git a/src/ps_main.c b/src/ps_main.c
index a163864..0dedd90 100644 (file)
--- a/src/ps_main.c
+++ b/src/ps_main.c
@@ -154,7 +154,6 @@ gboolean ps_main_init(TcorePlugin *p)
                NULL,
                NULL,
                &error);
-       g_free(address);
        g_assert_no_error(error);
        if (!conn)
                err("Failure: G-dBus Connection failed"); /* TODO - Clean-up */
@@ -174,6 +173,7 @@ gboolean ps_main_init(TcorePlugin *p)
 
        info("PacketService - dBus address: [%s] dBus connection ID: [%d]",
                address, id);
+       g_free(address);
 
        /*
         * Initializing custom data for Packet Service