Attachment 132430 Details for Bug 101568 – [04] _dbus_message_iter_open_signature: Clarify why this is not leaky

[patch] [04] _dbus_message_iter_open_signature: Clarify why this is not leaky

0008-_dbus_message_iter_open_signature-Clarify-why-this-i.patch (text/plain), 1.05 KB, created by Simon McVittie on 2017-07-04 17:56:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-07-04 17:56:52 UTC

Size: 1.05 KB

patch

obsolete

>From c66702b9e8a785bed3b4ca01fb18e5d9f6af6bd6 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Tue, 4 Jul 2017 13:33:30 +0100
>Subject: [PATCH 08/19] _dbus_message_iter_open_signature: Clarify why this is
> not leaky
>
>The same assertion appears closer to the top of the function, and there
>is no opportunity for it to have become false here.
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> dbus/dbus-message.c | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
>index 6d9dd55f..f66ac1a2 100644
>--- a/dbus/dbus-message.c
>+++ b/dbus/dbus-message.c
>@@ -2538,6 +2538,9 @@ _dbus_message_iter_open_signature (DBusMessageRealIter *real)
> 
>   real->sig_refcount = 1;
> 
>+  /* If this assertion failed, then str would be neither stored in u.writer
>+   * nor freed by this function, resulting in a memory leak. */
>+  _dbus_assert (real->u.writer.type_str == NULL);
>   _dbus_type_writer_add_types (&real->u.writer,
>                                str, _dbus_string_get_length (str));
>   return TRUE;
>-- 
>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.