Attachment 47779 Details for Bug 38120 – _dbus_header_byteswap: change the first byte of the message, not just the struct member

[patch] _dbus_header_byteswap: change the first byte of the message, not just the struct member

0001-_dbus_header_byteswap-change-the-first-byte-of-the-m.patch (text/plain), 1.34 KB, created by Simon McVittie on 2011-06-09 10:38:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-06-09 10:38:37 UTC

Size: 1.34 KB

patch

obsolete

>From 773951e27c18ad060977db63c9afea63b652a940 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 9 Jun 2011 17:52:10 +0100
>Subject: [PATCH 1/4] _dbus_header_byteswap: change the first byte of the
> message, not just the struct member
>
>This has been wrong approximately forever, for instance see:
>http://lists.freedesktop.org/archives/dbus/2007-March/007357.html
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38120
>---
> dbus/dbus-marshal-header.c |    6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
>diff --git a/dbus/dbus-marshal-header.c b/dbus/dbus-marshal-header.c
>index 3f31d7a..a6c9b80 100644
>--- a/dbus/dbus-marshal-header.c
>+++ b/dbus/dbus-marshal-header.c
>@@ -1468,14 +1468,20 @@ void
> _dbus_header_byteswap (DBusHeader *header,
>                        int         new_order)
> {
>+  unsigned char byte_order;
>+
>   if (header->byte_order == new_order)
>     return;
> 
>+  byte_order = _dbus_string_get_byte (&header->data, BYTE_ORDER_OFFSET);
>+  _dbus_assert (header->byte_order == byte_order);
>+
>   _dbus_marshal_byteswap (&_dbus_header_signature_str,
>                           0, header->byte_order,
>                           new_order,
>                           &header->data, 0);
> 
>+  _dbus_string_set_byte (&header->data, BYTE_ORDER_OFFSET, new_order);
>   header->byte_order = new_order;
> }
> 
>-- 
>1.7.5.3
>

Actions: View | Splinter Review

Attachments on bug 38120: 47779 | 47780 | 47781 | 47782 | 47783 | 47784

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.