From dae7a0c5eba6d05a2c595c86bcf85cc7839f9b40 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 19 Jan 2011 17:28:58 +0000
Subject: [PATCH 1/3] test_server_setup: on OOM while setting up watch/timeout, don't leak sd

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33128
---
 test/test-utils.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/test-utils.c b/test/test-utils.c
index eda20cd..67e207c 100644
--- a/test/test-utils.c
+++ b/test/test-utils.c
@@ -304,7 +304,7 @@ test_server_setup (DBusLoop      *loop,
                                         sd,
                                         serverdata_free))
     {
-      return FALSE;
+      goto nomem;
     }
 
   if (!dbus_server_set_timeout_functions (server,
@@ -313,7 +313,7 @@ test_server_setup (DBusLoop      *loop,
                                           NULL,
                                           sd, serverdata_free))
     {
-      return FALSE;
+      goto nomem;
     }   
   return TRUE;
 
-- 
1.7.2.3