Attachment 26514 Details for Bug 22141 – A better patch that doesn't erroneously leave the message locked

[patch] A better patch that doesn't erroneously leave the message locked

0001-Ensure-messages-are-locked-while-marshalling.patch (text/plain), 1.63 KB, created by Will Thompson on 2009-06-07 11:00:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Will Thompson

Created: 2009-06-07 11:00:19 UTC

Size: 1.63 KB

patch

obsolete

>From 6337116e42d564a3fb469ce7e9ef64e7534ab708 Mon Sep 17 00:00:00 2001
>From: Will Thompson <will.thompson@collabora.co.uk>
>Date: Sun, 7 Jun 2009 17:44:26 +0100
>Subject: [PATCH] Ensure messages are locked while marshalling.
>
>Locking a message has the side-effect of updating the message's length
>header. Previously, if dbus_message_marshal() was called on an unlocked
>message, it could yield an invalid message (as discovered by Ben
>Schwartz in <http://bugs.freedesktop.org/show_bug.cgi?id=19723>).
>---
> dbus/dbus-message.c |   15 +++++++++++++++
> 1 files changed, 15 insertions(+), 0 deletions(-)
>
>diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
>index edae425..83b1ebb 100644
>--- a/dbus/dbus-message.c
>+++ b/dbus/dbus-message.c
>@@ -3941,6 +3941,7 @@ dbus_message_marshal (DBusMessage  *msg,
>                       int          *len_p)
> {
>   DBusString tmp;
>+  dbus_bool_t was_locked;
> 
>   _dbus_return_val_if_fail (msg != NULL, FALSE);
>   _dbus_return_val_if_fail (marshalled_data_p != NULL, FALSE);
>@@ -3949,6 +3950,12 @@ dbus_message_marshal (DBusMessage  *msg,
>   if (!_dbus_string_init (&tmp))
>     return FALSE;
> 
>+  /* Ensure the message is locked, to ensure the length header is filled in. */
>+  was_locked = msg->locked;
>+
>+  if (!was_locked)
>+    dbus_message_lock (msg);
>+
>   if (!_dbus_string_copy (&(msg->header.data), 0, &tmp, 0))
>     goto fail;
> 
>@@ -3963,10 +3970,18 @@ dbus_message_marshal (DBusMessage  *msg,
>     goto fail;
> 
>   _dbus_string_free (&tmp);
>+
>+  if (!was_locked)
>+    msg->locked = FALSE;
>+
>   return TRUE;
> 
>  fail:
>   _dbus_string_free (&tmp);
>+
>+  if (!was_locked)
>+    msg->locked = FALSE;
>+
>   return FALSE;
> }
> 
>-- 
>1.6.3.1
>

Actions: View | Splinter Review

Attachments on bug 22141: 26513 | 26514

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.