luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 11:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdbus: Properly fix encoding of double arrays

Browse Source 
It turns out that this bug actually would (sometimes) impact any sort of
fixed-sized array with an alignment requirement of 8 due to incorrectly
counting the alignment inserted between the (aligned 4) array length and
the actual data.

Fix this properly and remove the exception for doubles.

https://bugzilla.gnome.org/show_bug.cgi?id=732754
This commit is contained in:
Ryan Lortie 2014-07-24 11:36:57 +02:00
parent 7009e317d8
commit 2268628565
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gio/gdbusmessage.c
View File

@ -1210,11 +1210,6 @@ get_type_fixed_size (const GVariantType *type)
{ {
/* NB: we do not treat 'b' as fixed-size here because GVariant and /* NB: we do not treat 'b' as fixed-size here because GVariant and
* D-Bus disagree about the size. * D-Bus disagree about the size.
*
* In addition 'd' is encoded differently by GVariant and DBus, so
* we force (en|de)coding rather than direct use of fixed data.
*
* https://bugzilla.gnome.org/show_bug.cgi?id=732754
*/ */
switch (*g_variant_type_peek_string (type)) switch (*g_variant_type_peek_string (type))
{ {
@ -1224,7 +1219,7 @@ get_type_fixed_size (const GVariantType *type)
return 2; return 2;
case 'i': case 'u': case 'h': case 'i': case 'u': case 'h':
return 4; return 4;
case 'x': case 't': case 'x': case 't': case 'd':
return 8; return 8;
default: default:
return 0; return 0;
@ -2425,7 +2420,8 @@ append_value_to_blob (GVariant *value,
else else
use_value = g_variant_ref (value); use_value = g_variant_ref (value);
ensure_output_padding (mbuf, fixed_size); array_payload_begin_offset += ensure_output_padding (mbuf, fixed_size);
array_len = g_variant_get_size (use_value); array_len = g_variant_get_size (use_value);
g_memory_buffer_write (mbuf, g_variant_get_data (use_value), array_len); g_memory_buffer_write (mbuf, g_variant_get_data (use_value), array_len);
g_variant_unref (use_value); g_variant_unref (use_value);