Attachment 141362 Details for Bug 107741 – Do not apply __attribute__((__malloc__)) to dbus_realloc()

[patch] Do not apply __attribute__((__malloc__)) to dbus_realloc()

0001-Do-not-apply-__attribute__-__malloc__-to-dbus_reallo.patch (text/plain), 1.27 KB, created by Simon McVittie on 2018-08-29 18:45:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2018-08-29 18:45:44 UTC

Size: 1.27 KB

patch

obsolete

>From bbe3bad512df0c202cb6a564744e7662d16d2059 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Thu, 23 Aug 2018 09:01:03 +0100
>Subject: [PATCH] Do not apply __attribute__((__malloc__)) to dbus_realloc()
>
>As noted in GLib commit c879f50f, gcc's interpretation of the malloc
>attribute has become more strict over time, which could result in
>miscompilation. The new definition is that in addition to assuming
>that the returned memory block is newly-allocated, gcc now assumes
>that it does not contain any valid pointers. This is OK for
>uninitialized or zero-initialized memory returned by dbus_malloc()
>or dbus_malloc0(), but not valid for dbus_realloc(), which might be
>used for a dynamically-sized array of (structures containing)
>valid pointers.
>
>See https://gitlab.gnome.org/GNOME/glib/issues/1465
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> dbus/dbus-memory.h | 1 -
> 1 file changed, 1 deletion(-)
>
>diff --git a/dbus/dbus-memory.h b/dbus/dbus-memory.h
>index 4fd56bd6..c575b46f 100644
>--- a/dbus/dbus-memory.h
>+++ b/dbus/dbus-memory.h
>@@ -48,7 +48,6 @@ DBUS_ALLOC_SIZE(1)
> void* dbus_malloc0       (size_t bytes);
> 
> DBUS_EXPORT
>-DBUS_MALLOC
> DBUS_ALLOC_SIZE(2)
> void* dbus_realloc       (void  *memory,
>                           size_t bytes);
>-- 
>2.19.0.rc1
>

Actions: View | Splinter Review

Attachments on bug 107741: 141362

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.