Cypher_Stack/libsecret
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libsecret.git synced 2024-12-22 20:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reference nonstatic schemas when we put them in a closure

Browse Source
This commit is contained in:
Stef Walter 2012-03-11 09:41:13 +01:00
parent 60f6e8e770
commit fda4704c56
3 changed files with 68 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/secret-password.c
View File

@ -51,6 +51,7 @@ static void
store_closure_free (gpointer data) store_closure_free (gpointer data)
{ {
StoreClosure *closure = data; StoreClosure *closure = data;
_secret_schema_unref_if_nonstatic (closure->schema);
g_hash_table_unref (closure->attributes); g_hash_table_unref (closure->attributes);
g_free (closure->collection_path); g_free (closure->collection_path);
g_free (closure->label); g_free (closure->label);
@ -207,7 +208,7 @@ secret_password_storev (const SecretSchema *schema,
res = g_simple_async_result_new (NULL, callback, user_data, res = g_simple_async_result_new (NULL, callback, user_data,
secret_password_storev); secret_password_storev);
closure = g_slice_new0 (StoreClosure); closure = g_slice_new0 (StoreClosure);
closure->schema = schema; closure->schema = _secret_schema_ref_if_nonstatic (schema);
closure->collection_path = g_strdup (collection_path); closure->collection_path = g_strdup (collection_path);
closure->label = g_strdup (label); closure->label = g_strdup (label);
closure->value = secret_value_new (password, -1, "text/plain"); closure->value = secret_value_new (password, -1, "text/plain");
@ -380,6 +381,7 @@ static void
lookup_closure_free (gpointer data) lookup_closure_free (gpointer data)
{ {
LookupClosure *closure = data; LookupClosure *closure = data;
_secret_schema_unref_if_nonstatic (closure->schema);
g_clear_object (&closure->cancellable); g_clear_object (&closure->cancellable);
g_hash_table_unref (closure->attributes); g_hash_table_unref (closure->attributes);
if (closure->value) if (closure->value)
@ -511,7 +513,7 @@ secret_password_lookupv (const SecretSchema *schema,
res = g_simple_async_result_new (NULL, callback, user_data, res = g_simple_async_result_new (NULL, callback, user_data,
secret_password_lookupv); secret_password_lookupv);
closure = g_slice_new0 (LookupClosure); closure = g_slice_new0 (LookupClosure);
closure->schema = schema; closure->schema = _secret_schema_ref_if_nonstatic (schema);
closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
closure->attributes = _secret_util_attributes_copy (attributes); closure->attributes = _secret_util_attributes_copy (attributes);
g_simple_async_result_set_op_res_gpointer (res, closure, lookup_closure_free); g_simple_async_result_set_op_res_gpointer (res, closure, lookup_closure_free);
@ -811,6 +813,7 @@ delete_closure_free (gpointer data)
DeleteClosure *closure = data; DeleteClosure *closure = data;
g_clear_object (&closure->cancellable); g_clear_object (&closure->cancellable);
g_hash_table_unref (closure->attributes); g_hash_table_unref (closure->attributes);
_secret_schema_unref_if_nonstatic (closure->schema);
g_slice_free (DeleteClosure, closure); g_slice_free (DeleteClosure, closure);
} }
@ -937,7 +940,7 @@ secret_password_removev (const SecretSchema *schema,
res = g_simple_async_result_new (NULL, callback, user_data, res = g_simple_async_result_new (NULL, callback, user_data,
secret_password_removev); secret_password_removev);
closure = g_slice_new0 (DeleteClosure); closure = g_slice_new0 (DeleteClosure);
closure->schema = schema; closure->schema = _secret_schema_ref_if_nonstatic (schema);
closure->attributes = _secret_util_attributes_copy (attributes); closure->attributes = _secret_util_attributes_copy (attributes);
closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL; closure->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
g_simple_async_result_set_op_res_gpointer (res, closure, delete_closure_free); g_simple_async_result_set_op_res_gpointer (res, closure, delete_closure_free);

4
library/secret-private.h
View File

@ -148,6 +148,10 @@ GVariant * _secret_session_encode_secret (SecretSession *se
SecretValue * _secret_session_decode_secret (SecretSession *session, SecretValue * _secret_session_decode_secret (SecretSession *session,
GVariant *encoded); GVariant *encoded);
const SecretSchema * _secret_schema_ref_if_nonstatic (const SecretSchema *schema);
void _secret_schema_unref_if_nonstatic (const SecretSchema *schema);
G_END_DECLS G_END_DECLS
#endif /* __SECRET_PRIVATE_H___ */ #endif /* __SECRET_PRIVATE_H___ */

16
library/secret-schema.c
View File

@ -242,6 +242,15 @@ secret_schema_ref (SecretSchema *schema)
return result; return result;
} }
const SecretSchema *
_secret_schema_ref_if_nonstatic (const SecretSchema *schema)
{
if (schema && g_atomic_int_get (&schema->reserved) > 0)
secret_schema_ref ((SecretSchema *)schema);
return schema;
}
/** /**
* secret_schema_unref: * secret_schema_unref:
* @schema: the schema to reference * @schema: the schema to reference
@ -273,4 +282,11 @@ secret_schema_unref (SecretSchema *schema)
} }
} }
void
_secret_schema_unref_if_nonstatic (const SecretSchema *schema)
{
if (schema && g_atomic_int_get (&schema->reserved) > 0)
secret_schema_unref ((SecretSchema *)schema);
}
G_DEFINE_BOXED_TYPE (SecretSchema, secret_schema, secret_schema_ref, secret_schema_unref); G_DEFINE_BOXED_TYPE (SecretSchema, secret_schema, secret_schema_ref, secret_schema_unref);