From: Havoc Pennington <hp@redhat.com>
Date: Sun, 2 Mar 2003 16:26:15 +0000 (+0000)
Subject: 2003-03-02  Havoc Pennington  <hp@pobox.com>
X-Git-Tag: dbus-0.6~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7584a7bdccc6c7cf9f3d11c315f088794729b7e4;p=thirdparty%2Fdbus.git

2003-03-02  Havoc Pennington  <hp@pobox.com>

	* dbus/dbus-message.c (decode_header_data): fix to always init
	message_padding, from Benjamin Dauvergne
---

diff --git a/ChangeLog b/ChangeLog
index eecf66ecc..1505e69f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-02  Havoc Pennington  <hp@pobox.com>
+
+	* dbus/dbus-message.c (decode_header_data): fix to always init
+	message_padding, from Benjamin Dauvergne
+
 2003-03-02  Havoc Pennington  <hp@pobox.com>
 
 	* configure.in: 0.5
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index 09ebeef8b..59d412ce4 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -2355,6 +2355,8 @@ _dbus_message_loader_unref (DBusMessageLoader *loader)
  * it can probably always return a buffer size to read exactly
  * the body of the next message, thus avoiding any memory wastage
  * or reallocs.
+ *
+ * @todo we need to enforce a max length on strings in header fields.
  * 
  * @param loader the message loader.
  * @param buffer the buffer
@@ -2399,6 +2401,7 @@ _dbus_message_loader_get_buffer (DBusMessageLoader  *loader,
 #define DBUS_HEADER_FIELD_SENDER_AS_UINT32  \
   FOUR_CHARS_TO_UINT32 ('s', 'n', 'd', 'r')
 
+/* FIXME impose max length on name, srvc, sndr */
 static dbus_bool_t
 decode_header_data (const DBusString   *data,
 		    int		        header_len,
@@ -2533,10 +2536,10 @@ decode_header_data (const DBusString   *data,
           _dbus_verbose ("header alignment padding is not nul\n");
           return FALSE;
         }
-
-      if (message_padding)
-	*message_padding = header_len - pos;
     }
+
+  if (message_padding)
+    *message_padding = header_len - pos;  
   
   return TRUE;
 }