cynara integration: initialize deferred_messages 08/244108/1
authorAdrian Szyndela <adrian.s@samsung.com>
Mon, 7 Sep 2020 11:10:11 +0000 (13:10 +0200)
committerAdrian Szyndela <adrian.s@samsung.com>
Tue, 15 Sep 2020 06:05:09 +0000 (08:05 +0200)
Initialize deferred messages in order to be able to alter them
on concurrent Cynara calls. This way we'll be able to run
both asynchronous requests for SEND and RECEIVE, if needed.

Change-Id: I060969ad5645c6a1d72f1c91edb46ecc3217ef79

bus/check.c
bus/connection.c
bus/dispatch.c
bus/policy.c

index 3cc01f8..0f3c8ed 100644 (file)
@@ -164,7 +164,7 @@ bus_check_queued_message_reply_callback (BusDeferredMessage *deferred_message,
       BusContext *context;
       BusRegistry *registry;
       BusClientPolicy *recipient_policy;
-      BusDeferredMessage *deferred_message_receive;
+      BusDeferredMessage *deferred_message_receive = NULL;
 
       context = bus_connection_get_context(deferred_message->proposed_recipient);
       registry = bus_context_get_registry(context);
@@ -465,7 +465,7 @@ bus_deferred_message_dispatch (BusDeferredMessage *deferred_message)
           break;
         case BUS_RESULT_LATER:
           {
-            BusDeferredMessage *deferred_message2;
+            BusDeferredMessage *deferred_message2 = NULL;
             result = bus_context_check_security_policy (context, transaction,
                                                         deferred_message->sender,
                                                         deferred_message->addressed_recipient,
index ad31d0b..dcb47ba 100644 (file)
@@ -2422,7 +2422,7 @@ bus_transaction_send_from_driver (BusTransaction *transaction,
                                   DBusMessage    *message)
 {
   DBusError error = DBUS_ERROR_INIT;
-  BusDeferredMessage *deferred_message;
+  BusDeferredMessage *deferred_message = NULL;
 
   /* We have to set the sender to the driver, and have
    * to check security policy since it was not done in
index 3cdae9f..9d2e893 100644 (file)
@@ -67,7 +67,7 @@ send_one_message (DBusConnection *connection,
                   DBusError      *error)
 {
   DBusError stack_error = DBUS_ERROR_INIT;
-  BusDeferredMessage *deferred_message;
+  BusDeferredMessage *deferred_message = NULL;
   BusResult result;
 
   result = bus_context_check_security_policy (context, transaction, sender, addressed_recipient,
@@ -143,7 +143,7 @@ bus_dispatch_matches (BusTransaction     *transaction,
   BusMatchmaker *matchmaker;
   DBusList *link;
   BusContext *context;
-  BusDeferredMessage *deferred_message;
+  BusDeferredMessage *deferred_message = NULL;
 
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
 
@@ -486,7 +486,7 @@ bus_dispatch (DBusConnection *connection,
   if (service_name &&
       strcmp (service_name, DBUS_SERVICE_DBUS) == 0) /* to bus driver */
     {
-      BusDeferredMessage *deferred_message;
+      BusDeferredMessage *deferred_message = NULL;
 
       if (!bus_transaction_capture (transaction, connection, NULL, message))
         {
@@ -556,7 +556,7 @@ bus_dispatch (DBusConnection *connection,
       if (service == NULL && dbus_message_get_auto_start (message))
         {
           BusActivation *activation;
-          BusDeferredMessage *deferred_message;
+          BusDeferredMessage *deferred_message = NULL;
 
           if (!bus_transaction_capture (transaction, connection, NULL,
                                         message))
index cbb66b9..7f4a040 100644 (file)
@@ -1810,7 +1810,7 @@ bus_client_policy_check_can_own (BusClientPolicy  *policy,
     {
       BusContext *context = bus_connection_get_context(connection);
       BusCheck *check = bus_context_get_check(context);
-      BusDeferredMessage *deferred_message;
+      BusDeferredMessage *deferred_message = NULL;
 
       result = bus_check_privilege(check, message, connection, NULL, NULL,
           privilege, BUS_DEFERRED_MESSAGE_CHECK_OWN, &deferred_message);