callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More robustness improvements of the parser

Browse Source 
svn path=/trunk/; revision=18978
This commit is contained in:
Matthias Clasen 2007-11-10 04:50:15 +00:00
parent f489387039
commit 6665188687
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2007-11-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbuilderparser.c: More robustness improvements
for the parser.
* gtk/gtkbuilderparser.c (parse_signal): Handle misplaced
signal elements without asserting.

18
gtk/gtkbuilderparser.c
View File

@ -244,8 +244,6 @@ parse_object (ParserData *data,
if (child_info && strcmp (child_info->tag.name, "object") == 0)
{
error_invalid_tag (data, element_name, NULL, error);
if (child_info)
free_object_info ((ObjectInfo*)child_info);
return;
}
@ -332,9 +330,7 @@ parse_child (ParserData *data,
object_info = state_peek_info (data, ObjectInfo);
if (!object_info || strcmp (object_info->tag.name, "object") != 0)
{
error_invalid_tag (data, element_name, "object", error);
if (object_info)
free_object_info (object_info);
error_invalid_tag (data, element_name, NULL, error);
return;
}
@ -375,11 +371,13 @@ parse_property (ParserData *data,
gchar *name = NULL;
gchar *context = NULL;
gboolean translatable = FALSE;
ObjectInfo *object_info;
int i;
if (data->stack == NULL)
object_info = state_peek_info (data, ObjectInfo);
if (!object_info || strcmp (object_info->tag.name, "object") != 0)
{
error_invalid_tag (data, "property", NULL, error);
error_invalid_tag (data, element_name, NULL, error);
return;
}
@ -446,11 +444,13 @@ parse_signal (ParserData *data,
gboolean after = FALSE;
gboolean swapped = FALSE;
gboolean swapped_set = FALSE;
ObjectInfo *object_info;
int i;
if (data->stack == NULL)
object_info = state_peek_info (data, ObjectInfo);
if (!object_info || strcmp (object_info->tag.name, "object") != 0)
{
error_invalid_tag (data, "signal", NULL, error);
error_invalid_tag (data, element_name, NULL, error);
return;
}