Attachment 42205 Details for Bug 33277 – [2/3] test_server_setup: allocate two server-data blobs, for watches and timeouts

[patch] [2/3] test_server_setup: allocate two server-data blobs, for watches and timeouts

0002-test_server_setup-allocate-two-server-data-blobs-for.patch (text/plain), 1.30 KB, created by Simon McVittie on 2011-01-19 09:43:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-01-19 09:43:47 UTC

Size: 1.30 KB

patch

obsolete

>From 26d5655dfbc562cc7721826b5d7f4b4a553f356f Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 19 Jan 2011 17:33:31 +0000
>Subject: [PATCH 2/3] test_server_setup: allocate two server-data blobs, for watches and timeouts
>
>This is similar to how ConnectionData works. Without this change, we
>deserve to segfault: when the first set of callbacks (either watches or
>timeouts) is cleaned up, we unref the server and loop, and free sd;
>when the second set of callbacks is cleaned up, we use-after-free sd,
>the server and the loop, then double-free sd.
>
>However, due to fd.o #33277 we don't even get that far, because we've
>already died with an assertion failure.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33277
>---
> test/test-utils.c |    4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
>diff --git a/test/test-utils.c b/test/test-utils.c
>index 67e207c..1c78812 100644
>--- a/test/test-utils.c
>+++ b/test/test-utils.c
>@@ -307,6 +307,10 @@ test_server_setup (DBusLoop      *loop,
>       goto nomem;
>     }
> 
>+  sd = serverdata_new (loop, server);
>+  if (sd == NULL)
>+    goto nomem;
>+
>   if (!dbus_server_set_timeout_functions (server,
>                                           add_server_timeout,
>                                           remove_server_timeout,
>-- 
>1.7.2.3
>

Actions: View | Splinter Review

Attachments on bug 33277: 42204 | 42205 | 42206 | 42225 | 42269

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.