Re: [PATCH BlueZ 1/2] gdbus: Fix replying to messages marked with NOREPLY flag

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Sun, Jan 28, 2018 at 11:50 AM, Luiz Augusto von Dentz
<luiz.dentz@xxxxxxxxx> wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
>
> When a sender flags a D-Bus message as not expecting a reply, it is
> against D-Bus policy to send a reply — sending one can result in an
> error as reported in:
>
> https://bugzilla.kernel.org/show_bug.cgi?id=198453
> ---
>  gdbus/object.c | 17 ++++++++++-------
>  1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/gdbus/object.c b/gdbus/object.c
> index 5c8ad7a55..e572c9f01 100644
> --- a/gdbus/object.c
> +++ b/gdbus/object.c
> @@ -1421,6 +1421,10 @@ DBusMessage *g_dbus_create_error_valist(DBusMessage *message, const char *name,
>  {
>         char str[1024];
>
> +       /* Check if the message can be replied */
> +       if (dbus_message_get_no_reply(message))
> +               return NULL;
> +
>         if (format)
>                 vsnprintf(str, sizeof(str), format, args);
>         else
> @@ -1449,6 +1453,10 @@ DBusMessage *g_dbus_create_reply_valist(DBusMessage *message,
>  {
>         DBusMessage *reply;
>
> +       /* Check if the message can be replied */
> +       if (dbus_message_get_no_reply(message))
> +               return NULL;
> +
>         reply = dbus_message_new_method_return(message);
>         if (reply == NULL)
>                 return NULL;
> @@ -1571,14 +1579,9 @@ gboolean g_dbus_send_reply_valist(DBusConnection *connection,
>  {
>         DBusMessage *reply;
>
> -       reply = dbus_message_new_method_return(message);
> -       if (reply == NULL)
> -               return FALSE;
> -
> -       if (dbus_message_append_args_valist(reply, type, args) == FALSE) {
> -               dbus_message_unref(reply);
> +       reply = g_dbus_create_reply_valist(message, type, args);
> +       if (!reply)
>                 return FALSE;
> -       }
>
>         return g_dbus_send_message(connection, reply);
>  }
> --
> 2.14.3


Pushed.



-- 
Luiz Augusto von Dentz
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux