Attachment 51905 Details for Bug 39720 – avoid assertions calling methods with collateral effects

[patch] avoid assertions calling methods with collateral effects

0003-Don-t-run-_transport_get_is_authenticated-within-an-.patch (text/plain), 1.25 KB, created by Cosimo Alfarano on 2011-10-03 09:54:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cosimo Alfarano

Created: 2011-10-03 09:54:54 UTC

Size: 1.25 KB

patch

obsolete

>From 0fb2684ecd436ab298e58e7fc9a3de913ccc5a08 Mon Sep 17 00:00:00 2001
>From: Cosimo Alfarano <cosimo.alfarano@collabora.com>
>Date: Mon, 3 Oct 2011 14:54:56 +0100
>Subject: [PATCH 3/5] Don't run _transport_get_is_authenticated() within an
> assert
>
>It has collateral effects (processing the auth process when the
>transport is not authenticated yet), which would be not run when
>DBUS_DISABLE_ASSERT is set.
>---
> dbus/dbus-connection.c |    8 +++++++-
> 1 files changed, 7 insertions(+), 1 deletions(-)
>
>diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
>index 9128ffc..ab1911a 100644
>--- a/dbus/dbus-connection.c
>+++ b/dbus/dbus-connection.c
>@@ -495,8 +495,14 @@ _dbus_connection_queue_received_message_link (DBusConnection  *connection,
>   DBusPendingCall *pending;
>   dbus_uint32_t reply_serial;
>   DBusMessage *message;
>+#ifndef DBUS_DISABLE_ASSERT
>+  dbus_bool_t authenticated;
>   
>-  _dbus_assert (_dbus_transport_get_is_authenticated (connection->transport));
>+  authenticated = _dbus_transport_get_is_authenticated (connection->transport);
>+  _dbus_assert (authenticated);
>+#else
>+  _dbus_transport_get_is_authenticated (connection->transport);
>+#endif
>   
>   _dbus_list_append_link (&connection->incoming_messages,
>                           link);
>-- 
>1.7.6.3
>

Actions: View | Splinter Review

Attachments on bug 39720: 51903 | 51904 | 51905 | 51906 | 51967 | 52219 | 52220 | 52221 | 52222 | 52223 | 52224 | 52225 | 52469 | 57713 | 58314 | 58315 | 58316 | 84480 | 84481

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.