Attachment 47783 Details for Bug 38120 – Test that a message with the byte order mangled causes disconnection but no crash

[patch] Test that a message with the byte order mangled causes disconnection but no crash

0001-Test-that-a-message-with-the-byte-order-mangled-caus.patch (text/plain), 3.47 KB, created by Simon McVittie on 2011-06-09 10:43:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-06-09 10:43:30 UTC

Size: 3.47 KB

patch

obsolete

>From 9a13adcc8da87cc4f73e074aacb852ee8ef063f8 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 9 Jun 2011 17:43:34 +0100
>Subject: [PATCH] Test that a message with the byte order mangled causes
> disconnection but no crash
>
>---
> test/corrupt.c |   90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 90 insertions(+), 0 deletions(-)
>
>diff --git a/test/corrupt.c b/test/corrupt.c
>index 728dc6a..e650ba5 100644
>--- a/test/corrupt.c
>+++ b/test/corrupt.c
>@@ -227,6 +227,93 @@ test_corrupt (Fixture *f,
> }
> 
> static void
>+test_byte_order (Fixture *f,
>+    gconstpointer addr)
>+{
>+  GSocket *socket;
>+  GError *gerror = NULL;
>+  int fd;
>+  char *blob;
>+  const gchar *arg = not_a_dbus_message;
>+  const gchar * const *args = &arg;
>+  int blob_len, len, total_sent;
>+  DBusMessage *message;
>+  dbus_bool_t mem;
>+
>+  test_message (f, addr);
>+
>+  message = dbus_message_new_signal ("/", "a.b", "c");
>+  g_assert (message != NULL);
>+  /* Append 0xFF bytes, so that the length of the body when byte-swapped
>+   * is 0xFF000000, which is invalid */
>+  mem = dbus_message_append_args (message,
>+      DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, &args, 0xFF,
>+      DBUS_TYPE_INVALID);
>+  g_assert (mem);
>+  mem = dbus_message_marshal (message, &blob, &blob_len);
>+  g_assert (mem);
>+  g_assert_cmpuint (blob_len, >, 0xFF);
>+  g_assert (blob != NULL);
>+
>+  dbus_message_unref (message);
>+
>+  /* Break the message by changing its claimed byte order, without actually
>+   * byteswapping anything. We happen to know that byte order is the first
>+   * byte. */
>+  if (blob[0] == 'B')
>+    blob[0] = 'l';
>+  else
>+    blob[0] = 'B';
>+
>+  /* OK, now the connection is working, let's break it */
>+
>+  dbus_connection_flush (f->server_conn);
>+
>+  if (!dbus_connection_get_socket (f->server_conn, &fd))
>+    g_error ("failed to steal fd from server connection");
>+
>+  socket = g_socket_new_from_fd (fd, &gerror);
>+  g_assert_no_error (gerror);
>+  g_assert (socket != NULL);
>+
>+  total_sent = 0;
>+
>+  while (total_sent < blob_len)
>+    {
>+      len = g_socket_send_with_blocking (socket, blob, blob_len, TRUE, NULL,
>+          &gerror);
>+      g_assert_no_error (gerror);
>+      g_assert (len >= 0);
>+      total_sent += len;
>+    }
>+
>+  dbus_free (blob);
>+
>+  /* Now spin on the client connection: the server just sent it a faulty
>+   * message, so it should disconnect */
>+  while (g_queue_is_empty (&f->client_messages))
>+    {
>+      g_print (".");
>+      g_main_context_iteration (NULL, TRUE);
>+    }
>+
>+  message = g_queue_pop_head (&f->client_messages);
>+
>+  g_assert (!dbus_message_contains_unix_fds (message));
>+  g_assert_cmpstr (dbus_message_get_destination (message), ==, NULL);
>+  g_assert_cmpstr (dbus_message_get_error_name (message), ==, NULL);
>+  g_assert_cmpstr (dbus_message_get_interface (message), ==,
>+      "org.freedesktop.DBus.Local");
>+  g_assert_cmpstr (dbus_message_get_member (message), ==, "Disconnected");
>+  g_assert_cmpstr (dbus_message_get_sender (message), ==, NULL);
>+  g_assert_cmpstr (dbus_message_get_signature (message), ==, "");
>+  g_assert_cmpstr (dbus_message_get_path (message), ==,
>+      "/org/freedesktop/DBus/Local");
>+
>+  dbus_message_unref (message);
>+}
>+
>+static void
> teardown (Fixture *f,
>     gconstpointer addr G_GNUC_UNUSED)
> {
>@@ -267,5 +354,8 @@ main (int argc,
>       test_corrupt, teardown);
> #endif
> 
>+  g_test_add ("/corrupt/byte-order/tcp", Fixture, "tcp:host=127.0.0.1", setup,
>+      test_byte_order, teardown);
>+
>   return g_test_run ();
> }
>-- 
>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.