Attachment 132442 Details for Bug 101568 – [05/15] dbus_message_iter_append_basic: Don't leak signature if appending fd fails

[patch] [05/15] dbus_message_iter_append_basic: Don't leak signature if appending fd fails

0005-dbus_message_iter_append_basic-Don-t-leak-signature-.patch (text/plain), 1.84 KB, created by Simon McVittie on 2017-07-04 18:31:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-07-04 18:31:54 UTC

Size: 1.84 KB

patch

obsolete

>From ec5f7f0cb2f3a0b0f4f955189ff82cb7cdc2d785 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Tue, 4 Jul 2017 14:13:15 +0100
>Subject: [PATCH 05/15] dbus_message_iter_append_basic: Don't leak signature if
> appending fd fails
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
>Avoid -W[error=]unused-label when building for Windows
>---
> dbus/dbus-message.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
>diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
>index f66ac1a2..9c2d5d1e 100644
>--- a/dbus/dbus-message.c
>+++ b/dbus/dbus-message.c
>@@ -2754,20 +2754,22 @@ dbus_message_iter_append_basic (DBusMessageIter *iter,
>       int *fds;
>       dbus_uint32_t u;
> 
>+      ret = FALSE;
>+
>       /* First step, include the fd in the fd list of this message */
>       if (!(fds = expand_fd_array(real->message, 1)))
>-        return FALSE;
>+        goto out;
> 
>       *fds = _dbus_dup(*(int*) value, NULL);
>       if (*fds < 0)
>-        return FALSE;
>+        goto out;
> 
>       u = real->message->n_unix_fds;
> 
>       /* Second step, write the index to the fd */
>       if (!(ret = _dbus_type_writer_write_basic (&real->u.writer, DBUS_TYPE_UNIX_FD, &u))) {
>         _dbus_close(*fds, NULL);
>-        return FALSE;
>+        goto out;
>       }
> 
>       real->message->n_unix_fds += 1;
>@@ -2786,6 +2788,9 @@ dbus_message_iter_append_basic (DBusMessageIter *iter,
>          freed. */
> #else
>       ret = FALSE;
>+      /* This is redundant (we could just fall through), but it avoids
>+       * -Wunused-label in builds that don't HAVE_UNIX_FD_PASSING */
>+      goto out;
> #endif
>     }
>   else
>@@ -2793,6 +2798,7 @@ dbus_message_iter_append_basic (DBusMessageIter *iter,
>       ret = _dbus_type_writer_write_basic (&real->u.writer, type, value);
>     }
> 
>+out:
>   if (!_dbus_message_iter_close_signature (real))
>     ret = FALSE;
> 
>-- 
>2.13.2
>

Actions: View | Splinter Review

Attachments on bug 101568: 132161 | 132162 | 132412 | 132413 | 132414 | 132415 | 132416 | 132417 | 132418 | 132427 | 132428 | 132429 | 132430 | 132431 | 132432 | 132433 | 132434 | 132435 | 132436 | 132437 | 132438 | 132439 | 132440 | 132441 | 132442 | 132447 | 132454

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.