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

- Treat enums like enums and not values - Avoid invalid free, in case of

Browse Source 
2008-03-07  Johan Dahlin  <johan@gnome.org>

    * gtk/gtkbuilder.c:
    * gtk/gtkbuilderparser.c:
    * gtk/gtkbuilderprivate.h:
    * gtk/gtkiconfactory.c:
    * tests/buildertest.c:
    - Treat enums like enums and not values
    - Avoid invalid free, in case of more than two sources
    - Add better error messages
    - Add much improved tests
    (#520979, Christian Persch)


svn path=/trunk/; revision=19732
This commit is contained in:
Johan Dahlin
2008-03-07 20:03:35 +00:00
committed by Johan Dahlin
parent f55db27521
commit 424cc287f1
6 changed files with 196 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkbuilderparser.c
View File

@ -915,9 +915,13 @@ text (GMarkupParseContext *context,
if (data->subparser && data->subparser->start)
{
GError *tmp_error = NULL;
if (data->subparser->parser->text)
data->subparser->parser->text (context, text, text_len,
data->subparser->data, error);
data->subparser->data, &tmp_error);
if (tmp_error)
g_propagate_error (error, tmp_error);
return;
}