Attachment 42807 Details for Bug 33126 – [7/7 v2] _dbus_transport_get_is_authenticated: don't leak if copying GUID fails

[patch] [7/7 v2] _dbus_transport_get_is_authenticated: don't leak if copying GUID fails

0001-_dbus_transport_get_is_authenticated-don-t-leak-if-c.patch (text/plain), 1.36 KB, created by Simon McVittie on 2011-02-01 05:29:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-02-01 05:29:20 UTC

Size: 1.36 KB

patch

obsolete

>From 5d4f5a1cfcf6862426dc4bd113637b10bbfa8a54 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 1 Feb 2011 13:03:44 +0000
>Subject: [PATCH] _dbus_transport_get_is_authenticated: don't leak if copying GUID fails
>
>This would fail the "SHA1 connection test" if _dbus_iterate is modified
>to allocate and free one extra pointer per iteration. The leak was one
>reference to the DBusConnection, on an unlikely OOM code path.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33126
>---
> dbus/dbus-transport.c |    6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
>
>diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c
>index a078f7c..dc23451 100644
>--- a/dbus/dbus-transport.c
>+++ b/dbus/dbus-transport.c
>@@ -748,8 +748,12 @@ _dbus_transport_get_is_authenticated (DBusTransport *transport)
> 
>               if (transport->expected_guid == NULL)
>                 {
>+                  /* Our auth object has authenticated, but we can't say we're
>+                   * authenticated until we've copied its GUID; fall
>+                   * through, so we'll behave the same as if the DBusAuth
>+                   * had said it wasn't ready. */
>                   _dbus_verbose ("No memory to complete auth\n");
>-                  return FALSE;
>+                  maybe_authenticated = FALSE;
>                 }
>             }
>         }
>-- 
>1.7.2.3
>

Actions: View | Splinter Review

Attachments on bug 33126: 42042 | 42043 | 42044 | 42045 | 42046 | 42168 | 42169 | 42170 | 42171 | 42172 | 42807 | 42808 | 42809

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.