diff options
author | Philip Withnall <withnall@endlessm.com> | 2017-11-14 16:13:13 +0000 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2017-11-14 23:13:14 +0000 |
commit | f7568dbfc8b9a38ad5b81179c83ae5a929b7c9a1 (patch) | |
tree | f44f25d625e2cf77bf4f413e0675810a3946edc9 /src/libostree | |
parent | 6b9ce9d35d9a8d5596b96f72da8f0f3faed3f62c (diff) | |
download | ostree-f7568dbfc8b9a38ad5b81179c83ae5a929b7c9a1.tar.gz |
lib/repo: Add (transfer) annotations to various GHashTable arguments
By default, unless it’s const, an (out) GHashTable will be assumed to be
(transfer full). That means the binding needs to free all the items in
the hash table, plus the table itself.
However, all the GHashTables we use have free functions set already, so
freeing the hash table will free its items. This results in a
double-free.
Fix that by ensuring we annotate such (out) hash tables as (transfer
container). Also annotate some other hash tables as (transfer none)
where appropriate, for clarity.
This fixes OSTree.Repo.list_collection_refs() in the Python bindings.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Closes: #1341
Approved by: dbnicholson
Diffstat (limited to 'src/libostree')
-rw-r--r-- | src/libostree/ostree-repo-finder.c | 4 | ||||
-rw-r--r-- | src/libostree/ostree-repo-refs.c | 15 | ||||
-rw-r--r-- | src/libostree/ostree-soup-form.c | 2 | ||||
-rw-r--r-- | src/libostree/ostree-soup-uri.c | 2 |
4 files changed, 14 insertions, 9 deletions
diff --git a/src/libostree/ostree-repo-finder.c b/src/libostree/ostree-repo-finder.c index 576a690c..9be176af 100644 --- a/src/libostree/ostree-repo-finder.c +++ b/src/libostree/ostree-repo-finder.c @@ -432,8 +432,8 @@ G_DEFINE_BOXED_TYPE (OstreeRepoFinderResult, ostree_repo_finder_result, * result * @priority: static priority of the result, where higher numbers indicate lower * priority - * @ref_to_checksum: (element-type OstreeCollectionRef utf8): map of collection–ref pairs - * to checksums provided by this result + * @ref_to_checksum: (element-type OstreeCollectionRef utf8) (transfer none): + * map of collection–ref pairs to checksums provided by this result * @summary_last_modified: Unix timestamp (seconds since the epoch, UTC) when * the summary file for the result was last modified, or `0` if this is unknown * diff --git a/src/libostree/ostree-repo-refs.c b/src/libostree/ostree-repo-refs.c index 9289bb37..ed496253 100644 --- a/src/libostree/ostree-repo-refs.c +++ b/src/libostree/ostree-repo-refs.c @@ -725,7 +725,8 @@ _ostree_repo_list_refs_internal (OstreeRepo *self, * ostree_repo_list_refs: * @self: Repo * @refspec_prefix: (allow-none): Only list refs which match this prefix - * @out_all_refs: (out) (element-type utf8 utf8): Mapping from ref to checksum + * @out_all_refs: (out) (element-type utf8 utf8) (transfer container): + * Mapping from ref to checksum * @cancellable: Cancellable * @error: Error * @@ -750,7 +751,8 @@ ostree_repo_list_refs (OstreeRepo *self, * ostree_repo_list_refs_ext: * @self: Repo * @refspec_prefix: (allow-none): Only list refs which match this prefix - * @out_all_refs: (out) (element-type utf8 utf8): Mapping from ref to checksum + * @out_all_refs: (out) (element-type utf8 utf8) (transfer container): + * Mapping from ref to checksum * @flags: Options controlling listing behavior * @cancellable: Cancellable * @error: Error @@ -778,7 +780,8 @@ ostree_repo_list_refs_ext (OstreeRepo *self, * ostree_repo_remote_list_refs: * @self: Repo * @remote_name: Name of the remote. - * @out_all_refs: (out) (element-type utf8 utf8): Mapping from ref to checksum + * @out_all_refs: (out) (element-type utf8 utf8) (transfer container): + * Mapping from ref to checksum * @cancellable: Cancellable * @error: Error * @@ -893,7 +896,8 @@ remote_list_collection_refs_process_refs (OstreeRepo *self, * ostree_repo_remote_list_collection_refs: * @self: Repo * @remote_name: Name of the remote. - * @out_all_refs: (out) (element-type OstreeCollectionRef utf8): Mapping from collection–ref to checksum + * @out_all_refs: (out) (element-type OstreeCollectionRef utf8) (transfer container): + * Mapping from collection–ref to checksum * @cancellable: Cancellable * @error: Error * @@ -1165,7 +1169,8 @@ _ostree_repo_update_collection_refs (OstreeRepo *self, * ostree_repo_list_collection_refs: * @self: Repo * @match_collection_id: (nullable): If non-%NULL, only list refs from this collection - * @out_all_refs: (out) (element-type OstreeCollectionRef utf8): Mapping from collection–ref to checksum + * @out_all_refs: (out) (element-type OstreeCollectionRef utf8) (transfer container): + * Mapping from collection–ref to checksum * @flags: Options controlling listing behavior * @cancellable: Cancellable * @error: Error diff --git a/src/libostree/ostree-soup-form.c b/src/libostree/ostree-soup-form.c index 74f9c7bb..dfaffb96 100644 --- a/src/libostree/ostree-soup-form.c +++ b/src/libostree/ostree-soup-form.c @@ -82,7 +82,7 @@ encode_pair (GString *str, const char *name, const char *value) /** * soup_form_encode_hash: - * @form_data_set: (element-type utf8 utf8): a hash table containing + * @form_data_set: (element-type utf8 utf8) (transfer none): a hash table containing * name/value pairs (as strings) * * Encodes @form_data_set into a value of type diff --git a/src/libostree/ostree-soup-uri.c b/src/libostree/ostree-soup-uri.c index 97f74636..a3fa2acc 100644 --- a/src/libostree/ostree-soup-uri.c +++ b/src/libostree/ostree-soup-uri.c @@ -1281,7 +1281,7 @@ soup_uri_set_query (SoupURI *uri, const char *query) /** * soup_uri_set_query_from_form: * @uri: a #SoupURI - * @form: (element-type utf8 utf8): a #GHashTable containing HTML form + * @form: (element-type utf8 utf8) (transfer none): a #GHashTable containing HTML form * information * * Sets @uri's query to the result of encoding @form according to the |