Attachment 42808 Details for Bug 33126 – [7/7 alternative] DBusTransport: don't copy DBusAuth's GUID to expected_guid

[patch] [7/7 alternative] DBusTransport: don't copy DBusAuth's GUID to expected_guid

0001-DBusTransport-don-t-copy-DBusAuth-s-GUID-to-expected.patch (text/plain), 2.13 KB, created by Simon McVittie on 2011-02-01 05:31:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-02-01 05:31:02 UTC

Size: 2.13 KB

patch

obsolete

>From 6acfa53e9a7fc62bf91dc7c175d0b927287a5a66 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 1 Feb 2011 12:27:39 +0000
>Subject: [PATCH] DBusTransport: don't copy DBusAuth's GUID to expected_guid
>
>There was previously a leak in _dbus_transport_get_is_authenticated, if
>we hit OOM when copying the server's actual GUID. This would fail the
>"SHA1 connection test" if _dbus_iterate was modified to allocate and free
>one extra pointer per iteration.
>
>Rather than adding OOM handling everywhere, if we avoid strdup'ing the
>GUID, and just re-fetch the const string from the DBusAuth object on demand
>instead, we go back to a situation where _dbus_transport_get_is_authenticated
>can't fail.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33126
>---
> dbus/dbus-transport.c |   14 +++-----------
> 1 files changed, 3 insertions(+), 11 deletions(-)
>
>diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c
>index a078f7c..ba6bd4b 100644
>--- a/dbus/dbus-transport.c
>+++ b/dbus/dbus-transport.c
>@@ -30,6 +30,7 @@
> #include "dbus-auth.h"
> #include "dbus-address.h"
> #include "dbus-credentials.h"
>+#include "dbus-mainloop.h"
> #include "dbus-message-private.h"
> #include "dbus-marshal-header.h"
> #ifdef DBUS_BUILD_TESTS
>@@ -741,17 +742,6 @@ _dbus_transport_get_is_authenticated (DBusTransport *transport)
>               _dbus_connection_unref_unlocked (transport->connection);
>               return FALSE;
>             }
>-
>-          if (transport->expected_guid == NULL)
>-            {
>-              transport->expected_guid = _dbus_strdup (server_guid);
>-
>-              if (transport->expected_guid == NULL)
>-                {
>-                  _dbus_verbose ("No memory to complete auth\n");
>-                  return FALSE;
>-                }
>-            }
>         }
> 
>       /* If we're the server, see if we want to allow this identity to proceed.
>@@ -853,6 +843,8 @@ _dbus_transport_get_server_id (DBusTransport *transport)
> {
>   if (transport->is_server)
>     return NULL;
>+  else if (transport->authenticated)
>+    return _dbus_auth_get_guid_from_server (transport->auth);
>   else
>     return transport->expected_guid;
> }
>-- 
>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.