Attachment 132438 Details for Bug 101568 – [12] Test dbus_message_iter_abandon_container_if_open under OOM conditions

[patch] [12] Test dbus_message_iter_abandon_container_if_open under OOM conditions

0016-Test-dbus_message_iter_abandon_container_if_open-und.patch (text/plain), 3.18 KB, created by Simon McVittie on 2017-07-04 18:04:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-07-04 18:04:29 UTC

Size: 3.18 KB

patch

obsolete

>From fb2073cc41985a95d55ea3078199617ce99f2915 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Tue, 4 Jul 2017 16:43:48 +0100
>Subject: [PATCH 16/19] Test dbus_message_iter_abandon_container_if_open under
> OOM conditions
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> test/message.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 75 insertions(+)
>
>diff --git a/test/message.c b/test/message.c
>index 3d959941..75c441e5 100644
>--- a/test/message.c
>+++ b/test/message.c
>@@ -176,6 +176,80 @@ out:
>   return !g_test_failed ();
> }
> 
>+/* Similar to test_array(), but making use of
>+ * dbus_message_iter_abandon_container_if_open().
>+ *
>+ * Return TRUE if the right thing happens, but the right thing might include
>+ * OOM. */
>+static dbus_bool_t
>+test_zero_iter (void *ignored)
>+{
>+  DBusMessage *m;
>+  DBusMessageIter iter = DBUS_MESSAGE_ITER_INIT_CLOSED;
>+  DBusMessageIter arr_iter = DBUS_MESSAGE_ITER_INIT_CLOSED;
>+  DBusMessageIter inner_iter;
>+  dbus_int32_t fortytwo = 42;
>+  dbus_bool_t message_should_be_complete = FALSE;
>+
>+  /* This one was left uninitialized, just so we could exercise this
>+   * function */
>+  dbus_message_iter_init_closed (&inner_iter);
>+
>+  m = dbus_message_new_signal ("/", "a.b", "c");
>+
>+  if (m == NULL)
>+    goto out;
>+
>+  dbus_message_iter_init_append (m, &iter);
>+
>+  if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY,
>+                                         "ai", &arr_iter))
>+    goto out;
>+
>+  if (!dbus_message_iter_open_container (&arr_iter, DBUS_TYPE_ARRAY, "i",
>+                                         &inner_iter))
>+    goto out;
>+
>+  if (!dbus_message_iter_append_basic (&inner_iter, DBUS_TYPE_INT32, &fortytwo))
>+    goto out;
>+
>+  if (!dbus_message_iter_close_container (&arr_iter, &inner_iter))
>+    goto out;
>+
>+  if (!dbus_message_iter_close_container (&iter, &arr_iter))
>+    goto out;
>+
>+  message_should_be_complete = TRUE;
>+
>+out:
>+  dbus_message_iter_abandon_container_if_open (&arr_iter, &inner_iter);
>+  dbus_message_iter_abandon_container_if_open (&iter, &arr_iter);
>+  /* Redundant calls are OK */
>+  dbus_message_iter_abandon_container_if_open (&iter, &arr_iter);
>+
>+  /* dbus_message_iter_abandon_container_if_open does not leave the message
>+   * in what seems to be consistently documented as a "hosed" state */
>+  if (message_should_be_complete)
>+    {
>+      DBusBasicValue read_back;
>+
>+      _DBUS_ZERO (read_back);
>+      dbus_message_iter_init (m, &iter);
>+      dbus_message_iter_recurse (&iter, &arr_iter);
>+      dbus_message_iter_recurse (&arr_iter, &inner_iter);
>+      dbus_message_iter_get_basic (&inner_iter, &read_back);
>+      g_assert_cmpint (read_back.i32, ==, 42);
>+    }
>+
>+  if (m != NULL)
>+    dbus_message_unref (m);
>+
>+  dbus_shutdown ();
>+  g_assert_cmpint (_dbus_get_malloc_blocks_outstanding (), ==, 0);
>+
>+  return !g_test_failed ();
>+}
>+
> typedef struct
> {
>   const gchar *name;
>@@ -228,6 +302,7 @@ main (int argc,
>   add_oom_test ("/message/array/dict", test_array, "{ss}");
>   add_oom_test ("/message/array/variant", test_array, "v");
>   add_oom_test ("/message/fd", test_fd, NULL);
>+  add_oom_test ("/message/zero-iter", test_zero_iter, NULL);
> 
>   ret = g_test_run ();
> 
>-- 
>2.13.2
>

Actions: View | Splinter Review

Attachments on bug 101568: 132161 | 132162 | 132412 | 132413 | 132414 | 132415 | 132416 | 132417 | 132418 | 132427 | 132428 | 132429 | 132430 | 132431 | 132432 | 132433 | 132434 | 132435 | 132436 | 132437 | 132438 | 132439 | 132440 | 132441 | 132442 | 132447 | 132454

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.