Attachment 85073 Details for Bug 68852 – 3/6] corrupt test: close connection before releasing GSocket

[patch] 3/6] corrupt test: close connection before releasing GSocket

0003-corrupt-test-close-connection-before-releasing-GSock.patch (text/plain), 1.58 KB, created by Simon McVittie on 2013-09-02 16:23:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-09-02 16:23:35 UTC

Size: 1.58 KB

patch

obsolete

>From d2a7c42b7fb65232130dc41179abdf9832a922c7 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 2 Sep 2013 17:14:38 +0100
>Subject: [PATCH 3/6] corrupt test: close connection before releasing GSocket
>
>GSocket takes responsibility for closing the fd, and there doesn't
>seem to be any way to tell it not to. When this test is adapted to run
>under DBusLoop as an alternative to dbus-glib, that becomes a problem,
>because DBusLoop/DBusSocketSetEpoll do not tolerate that. Work around it.
>---
> test/corrupt.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
>diff --git a/test/corrupt.c b/test/corrupt.c
>index 0249590..be0e022 100644
>--- a/test/corrupt.c
>+++ b/test/corrupt.c
>@@ -246,6 +246,16 @@ test_corrupt (Fixture *f,
>       "/org/freedesktop/DBus/Local");
> 
>   dbus_message_unref (incoming);
>+
>+  /* Free the DBusConnection before the GSocket, because GSocket is
>+   * going to close our fd. GSocket tolerates closing an already-closed
>+   * fd, whereas DBusLoop + DBusSocketSetEpoll doesn't. On Unix
>+   * we could use dup() but that isn't portable to Windows :-(
>+   */
>+  dbus_connection_close (f->server_conn);
>+  dbus_connection_unref (f->server_conn);
>+  f->server_conn = NULL;
>+
>   g_object_unref (socket);
> }
> 
>@@ -325,6 +335,12 @@ test_byte_order (Fixture *f,
>       "/org/freedesktop/DBus/Local");
> 
>   dbus_message_unref (message);
>+
>+  /* Free the DBusConnection before the GSocket, as above. */
>+  dbus_connection_close (f->server_conn);
>+  dbus_connection_unref (f->server_conn);
>+  f->server_conn = NULL;
>+
>   g_object_unref (socket);
> }
> 
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 68852: 85071 | 85072 | 85073 | 85074 | 85076 | 85077 | 85082 | 85109 | 85110 | 85240 | 85604

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.