luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-15 20:18:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

GSettings: verify path validity on constructors

Browse Source 
Don't allow constructing GSettings objects with invalid paths.

https://bugzilla.gnome.org/show_bug.cgi?id=704802
This commit is contained in:
Ryan Lortie 2013-10-23 16:42:12 -04:00
parent 0a7d1084a5
commit 6568843624
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gio/gsettings.c
View File

@ -866,6 +866,21 @@ g_settings_new (const gchar *schema_id)
NULL); NULL);
} }
static gboolean
path_is_valid (const gchar *path)
{
if (!path)
return FALSE;
if (path[0] != '/')
return FALSE;
if (!g_str_has_suffix (path, "/"))
return FALSE;
return strstr (path, "//") == NULL;
}
/** /**
* g_settings_new_with_path: * g_settings_new_with_path:
* @schema_id: the id of the schema * @schema_id: the id of the schema
@ -881,6 +896,10 @@ g_settings_new (const gchar *schema_id)
* It is a programmer error to call this function for a schema that * It is a programmer error to call this function for a schema that
* has an explicitly specified path. * has an explicitly specified path.
* *
* It is a programmer error if @path is not a valid path. A valid path
* begins and ends with '/' and does not contain two consecutive '/'
* characters.
*
* Returns: a new #GSettings object * Returns: a new #GSettings object
* *
* Since: 2.26 * Since: 2.26
@ -890,7 +909,7 @@ g_settings_new_with_path (const gchar *schema_id,
const gchar *path) const gchar *path)
{ {
g_return_val_if_fail (schema_id != NULL, NULL); g_return_val_if_fail (schema_id != NULL, NULL);
g_return_val_if_fail (path != NULL, NULL); g_return_val_if_fail (path_is_valid (path), NULL);
return g_object_new (G_TYPE_SETTINGS, return g_object_new (G_TYPE_SETTINGS,
"schema-id", schema_id, "schema-id", schema_id,
@ -952,7 +971,7 @@ g_settings_new_with_backend_and_path (const gchar *schema_id,
{ {
g_return_val_if_fail (schema_id != NULL, NULL); g_return_val_if_fail (schema_id != NULL, NULL);
g_return_val_if_fail (G_IS_SETTINGS_BACKEND (backend), NULL); g_return_val_if_fail (G_IS_SETTINGS_BACKEND (backend), NULL);
g_return_val_if_fail (path != NULL, NULL); g_return_val_if_fail (path_is_valid (path), NULL);
return g_object_new (G_TYPE_SETTINGS, return g_object_new (G_TYPE_SETTINGS,
"schema-id", schema_id, "schema-id", schema_id,
@ -1000,6 +1019,10 @@ g_settings_new_full (GSettingsSchema *schema,
GSettingsBackend *backend, GSettingsBackend *backend,
const gchar *path) const gchar *path)
{ {
g_return_val_if_fail (schema != NULL, NULL);
g_return_val_if_fail (backend == NULL || G_IS_SETTINGS_BACKEND (backend), NULL);
g_return_val_if_fail (path == NULL || path_is_valid (path), NULL);
return g_object_new (G_TYPE_SETTINGS, return g_object_new (G_TYPE_SETTINGS,
"settings-schema", schema, "settings-schema", schema,
"backend", backend, "backend", backend,