Attachment 93127 Details for Bug 71093 – [tp-glib master 2/2] TpProtocol: fix some suspicious memory management

[patch] [tp-glib master 2/2] TpProtocol: fix some suspicious memory management

0002-TpProtocol-fix-some-suspicious-memory-management.patch (text/plain), 1.55 KB, created by Simon McVittie on 2014-01-31 12:35:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2014-01-31 12:35:19 UTC

Size: 1.55 KB

patch

obsolete

>From 7ccb823c07f5656136ed2b20abdb5a89e112d4cf Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 30 Jan 2014 20:04:08 +0000
>Subject: [PATCH 2/2] TpProtocol: fix some suspicious memory management
>
>It works fine as long as a preallocated GArray doesn't move its memory
>buffer for no reason, but it's good to be obviously correct. Spotted while
>working on the previous commit.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71093
>---
> telepathy-glib/protocol.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c
>index ee9b7e2..3c7ed99 100644
>--- a/telepathy-glib/protocol.c
>+++ b/telepathy-glib/protocol.c
>@@ -192,15 +192,15 @@ tp_protocol_params_from_param_specs (const GPtrArray *parameters,
>     {
>       GValue structure = { 0 };
>       GValue *tmp;
>-      /* Points to the zeroed entry just after the end of the array
>-       * - but we're about to extend the array to make it valid */
>-      TpConnectionManagerParam *param = &g_array_index (output,
>-          TpConnectionManagerParam, output->len);
>+      TpConnectionManagerParam *param;
> 
>       g_value_init (&structure, TP_STRUCT_TYPE_PARAM_SPEC);
>       g_value_set_static_boxed (&structure, g_ptr_array_index (parameters, i));
> 
>       g_array_set_size (output, output->len + 1);
>+      /* point to the new last item */
>+      param = &g_array_index (output, TpConnectionManagerParam,
>+          output->len - 1);
> 
>       if (!dbus_g_type_struct_get (&structure,
>             0, &param->name,
>-- 
>1.9.rc1
>

Actions: View | Splinter Review

Attachments on bug 71093: 93126 | 93127 | 93128 | 93129 | 93130 | 93131 | 93132 | 93133 | 93134 | 93137 | 93138 | 93316 | 93317 | 93318 | 93319 | 93320 | 93476 | 93477

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.