Attachment 660649 Details for Bug 885046 – Proposed fix

[patch] Proposed fix

885046.patch (text/plain), 1.31 KB, created by Matthew Booth on 2012-12-10 09:52:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Booth

Created: 2012-12-10 09:52:38 UTC

Size: 1.31 KB

patch

obsolete

>commit 8c14cfddce7f75c834966d79a52012391244db6c
>Author: Matthew Booth <mbooth@redhat.com>
>Date:   Mon Dec 10 09:46:19 2012 +0000
>
>    Fix crash when returned string property is NULL
>    
>    Fixes RHBZ#885046
>
>diff --git a/src/ldm.c b/src/ldm.c
>index 7335982..4897de9 100644
>--- a/src/ldm.c
>+++ b/src/ldm.c
>@@ -239,9 +239,12 @@ ldm_error_get_type(void)
> gchar *                                                                        \
> ldm_ ## object ## _get_ ## property(const klass * const o)                     \
> {                                                                              \
>-    const size_t len = strlen(o->priv->property) + 1;                          \
>+    gpointer p = o->priv->property;                                            \
>+    if (p == NULL) return NULL;                                                \
>+                                                                               \
>+    const size_t len = strlen(p) + 1;                                          \
>     gchar * const r = g_malloc(len);                                           \
>-    memcpy(r, o->priv->property, len);                                         \
>+    memcpy(r, p, len);                                                         \
>     return r;                                                                  \
> }
>

Actions: View | Diff

Attachments on bug 885046: 660649