Bug 17329 - dbus-glib does not support complex hash values: a{ua(uu)}
Summary: dbus-glib does not support complex hash values: a{ua(uu)}
Status: RESOLVED FIXED
Alias: None
Product: dbus
Classification: Unclassified
Component: GLib (show other bugs)
Version: unspecified
Hardware: Other All
: medium normal
Assignee: Robert McQueen
QA Contact: John (J5) Palmieri
URL:
Whiteboard:
Keywords:
Depends on: 17795 17798
Blocks:
  Show dependency treegraph
 
Reported: 2008-08-27 08:39 UTC by Alban Crequy
Modified: 2008-11-28 12:29 UTC (History)
1 user (show)

See Also:
i915 platform:
i915 features:


Attachments
allow hash tables to contain complex types (11.77 KB, patch)
2008-09-26 09:13 UTC, Robert McQueen
Details | Splinter Review

Note You need to log in before you can comment on or make changes to this bug.
Description Alban Crequy 2008-08-27 08:39:38 UTC
dbus_g_method_return() fails (Segmentation fault) if the return type is a map where its value type is a struct. Example of type which does not work: a{ua(uu)}

The function _dbus_gtype_is_valid_hash_value() retuns FALSE.
Comment 1 Robert McQueen 2008-09-26 09:13:20 UTC
Created attachment 19246 [details] [review]
allow hash tables to contain complex types

Previously, dbus-glib has provided destroy functions for the keys and
values when constructing hash tables, so that any hash tables it
constructed could be entirely freed (along with their contents) by
destroying/unreffing. Unfortunately this meant that any "complex" types,
where you need to know the GType in order to free them, were not allowed
in hash tables. In real terms, this was anything which dbus-glib
marshalled to a GPtrArray, so any array of arrays, variants, structures,
object paths, or other boxed types were not allowed as hash values.

This patch allows a broader range of types to be used as the values in
hash tables, including those where no simple free function is available.
Instead of relying on the key/value destroy functions, the new hash_free
function uses g_hash_table_foreach_steal to remove the keys and values
pairwise and free them when the type is known.

Unfortunately, it's part of the API assumptions that hash tables which
were produced through the current API had valid free functions, and
particularly that if the hash table was reffed by the application, that
the keys/values would persist beyond when dbus-glib had unreffed it, and
be freed when the hash table was later destroyed. So it's not sufficient
to use only this new freeing method on all hash tables from now on - we
have to behave in the old way for all of the previously allowable types
(including any hash tables which contain any hash tables which were
freeable in the old way).

However, as these new hash tables contain values which will not be freed
if you manipulate the hash table directly (removing or replacing keys,
or destroying or unreffing it directly), and g_boxed_free should be used
instead, a false free function is provided to print a critical warning
for the developer in the case that memory would be leaked.
Comment 2 Colin Walters 2008-10-26 07:32:24 UTC
Looks pretty good to me, thanks for the extensive comments.  

I'm a bit unsure why you changed the existing tests if the idea was to have backwards compat; maybe add new tests?

Regardless feel free to commit, thanks!
Comment 3 Robert McQueen 2008-11-28 12:29:37 UTC
I an existing test because I added it in another patch in this series. The tests for a{gas} and a{oas} which test 'g' and 'o' as hash keys and 'as' as a hash value. But there's no need to test 'as' values twice, so one of the two got repurposed. Merging this.


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.