Attachment 132304 Details for Bug 101566 – test/loopback: Don't leak address strings

[patch] test/loopback: Don't leak address strings

0002-test-loopback-Don-t-leak-address-strings.patch (text/plain), 1.66 KB, created by Simon McVittie on 2017-06-28 18:05:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-06-28 18:05:02 UTC

Size: 1.66 KB

patch

obsolete

>From 7c9c53adbf504e29865771e0ad13bc148edecce5 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Wed, 28 Jun 2017 18:49:18 +0100
>Subject: [PATCH 2/4] test/loopback: Don't leak address strings
>
>dbus_server_get_address() returns a copy. It isn't clear why.
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> test/loopback.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
>diff --git a/test/loopback.c b/test/loopback.c
>index 5232a09a..46e9758d 100644
>--- a/test/loopback.c
>+++ b/test/loopback.c
>@@ -160,10 +160,12 @@ static void
> test_connect (Fixture *f,
>     gconstpointer addr G_GNUC_UNUSED)
> {
>+  char *address;
>   g_assert (f->server_conn == NULL);
> 
>-  f->client_conn = dbus_connection_open_private (
>-      dbus_server_get_address (f->server), &f->e);
>+  address = dbus_server_get_address (f->server);
>+  g_test_message ("listening at %s", address);
>+  f->client_conn = dbus_connection_open_private (address, &f->e);
>   assert_no_error (&f->e);
>   g_assert (f->client_conn != NULL);
>   test_connection_setup (f->ctx, f->client_conn);
>@@ -173,6 +175,8 @@ test_connect (Fixture *f,
>       test_progress ('.');
>       test_main_context_iterate (f->ctx, TRUE);
>     }
>+
>+  dbus_free (address);
> }
> 
> static void
>@@ -180,7 +184,7 @@ test_bad_guid (Fixture *f,
>     gconstpointer addr G_GNUC_UNUSED)
> {
>   DBusMessage *incoming;
>-  gchar *address = g_strdup (dbus_server_get_address (f->server));
>+  char *address = dbus_server_get_address (f->server);
>   gchar *guid;
> 
>   g_test_bug ("39720");
>@@ -232,7 +236,7 @@ test_bad_guid (Fixture *f,
> 
>   dbus_message_unref (incoming);
> 
>-  g_free (address);
>+  dbus_free (address);
> }
> 
> static void
>-- 
>2.13.2
>

Actions: View | Splinter Review

Attachments on bug 101566: 132158 | 132304 | 132305 | 132306

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.