luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-11-04 01:58:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add 3 new restrictions to the schema compiler

Browse Source 
- can not extend schemas that already have paths
 - can not form list of schemas that already have paths
 - the path of a list schema, if given, must end with ':/'
This commit is contained in:
Ryan Lortie
2010-09-09 16:28:18 -04:00
parent 7777dd2c39
commit f8cb2a60b9
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gio/glib-compile-schemas.c
View File

@@ -1055,7 +1055,9 @@ parse_state_start_schema (ParseState *state,
if (list_of)
{
if (!g_hash_table_lookup (state->schema_table, list_of))
SchemaState *tmp;
if (!(tmp = g_hash_table_lookup (state->schema_table, list_of)))
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_INVALID_CONTENT,
@@ -1063,10 +1065,24 @@ parse_state_start_schema (ParseState *state,
"existing schema '%s'"), id, list_of);
return;
}
if (tmp->path)
{
g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
_("Can not be a list of a schema with a path"));
return;
}
}
if (extends)
{
if (extends->path)
{
g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
_("Can not extend a schema with a path"));
return;
}
if (list_of)
{
if (extends->list_of == NULL)
@@ -1104,6 +1120,13 @@ parse_state_start_schema (ParseState *state,
return;
}
if (path && list_of && !g_str_has_suffix (path, ":/"))
{
g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
_("the path of a list must end with ':/'"));
return;
}
state->schema_state = schema_state_new (path, gettext_domain,
extends, extends_name, list_of);
g_hash_table_insert (state->schema_table, g_strdup (id),