Attachment 129252 Details for Bug 99612 – connection: Fix an LSM label memory leak on an error handling path

[patch] connection: Fix an LSM label memory leak on an error handling path

connection-Fix-an-LSM-label-memory-leak-on-an-erro.patch (text/plain), 1.94 KB, created by Philip Withnall on 2017-01-31 10:08:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philip Withnall

Created: 2017-01-31 10:08:18 UTC

Size: 1.94 KB

patch

obsolete

>From 3d46f3b88ec00c3535e76762c5baf7f483901a41 Mon Sep 17 00:00:00 2001
>From: Philip Withnall <withnall@endlessm.com>
>Date: Tue, 31 Jan 2017 10:04:49 +0000
>Subject: [PATCH] connection: Fix an LSM label memory leak on an error handling
> path
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This is almost certainly not going to make a difference, as itâs on the
>OOM handling path; but the fewer leaks the better.
>
>Coverity ID: 141058
>
>https://bugs.freedesktop.org/show_bug.cgi?id=99612
>---
> bus/connection.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
>diff --git a/bus/connection.c b/bus/connection.c
>index 4b53cd0..c935cc5 100644
>--- a/bus/connection.c
>+++ b/bus/connection.c
>@@ -584,7 +584,7 @@ cache_peer_loginfo_string (BusConnectionData *d,
>   DBusString loginfo_buf;
>   unsigned long uid;
>   unsigned long pid;
>-  char *windows_sid, *security_label;
>+  char *windows_sid = NULL, *security_label = NULL;
>   dbus_bool_t prev_added;
> 
>   if (!_dbus_string_init (&loginfo_buf))
>@@ -630,6 +630,7 @@ cache_peer_loginfo_string (BusConnectionData *d,
>       did_append = _dbus_string_append_printf (&loginfo_buf,
>                                                "sid=\"%s\"", windows_sid);
>       dbus_free (windows_sid);
>+      windows_sid = NULL;
>       if (!did_append)
>         goto oom;
>       else
>@@ -649,6 +650,7 @@ cache_peer_loginfo_string (BusConnectionData *d,
>       did_append = _dbus_string_append_printf (&loginfo_buf,
>                                                "label=\"%s\"", security_label);
>       dbus_free (security_label);
>+      security_label = NULL;
>       if (!did_append)
>         goto oom;
>       else
>@@ -663,6 +665,11 @@ cache_peer_loginfo_string (BusConnectionData *d,
>   return TRUE;
> oom:
>    _dbus_string_free (&loginfo_buf);
>+   if (security_label != NULL)
>+     dbus_free (security_label);
>+   if (windows_sid != NULL)
>+     dbus_free (windows_sid);
>+
>    return FALSE;
> }
> 
>-- 
>2.9.3

Actions: View | Splinter Review

Attachments on bug 99612: 129252

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.