luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-25 21:46:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Report unfinished entity references as errors rather than running into an

Browse Source 
* glib/gmarkup.c (unescape_text): Report unfinished entity
	references as errors rather than running into an assert.  (#80441)
This commit is contained in:
Matthias Clasen 2002-05-07 21:45:21 +00:00
parent 2038143ae7
commit 6853c2b880
8 changed files with 56 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2002-05-07 Matthias Clasen <maclas@gmx.de>
* glib/gmarkup.c (unescape_text): Report unfinished entity
references as errors rather than running into an assert. (#80441)
2002-05-07 Michael Natterer <mitch@gimp.org> 2002-05-07 Michael Natterer <mitch@gimp.org>
* configure.in: added a new conditional CROSS_COMPILING which * configure.in: added a new conditional CROSS_COMPILING which

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2002-05-07 Matthias Clasen <maclas@gmx.de>
* glib/gmarkup.c (unescape_text): Report unfinished entity
references as errors rather than running into an assert. (#80441)
2002-05-07 Michael Natterer <mitch@gimp.org> 2002-05-07 Michael Natterer <mitch@gimp.org>
* configure.in: added a new conditional CROSS_COMPILING which * configure.in: added a new conditional CROSS_COMPILING which

5
ChangeLog.pre-2-12
View File

@ -1,3 +1,8 @@
2002-05-07 Matthias Clasen <maclas@gmx.de>
* glib/gmarkup.c (unescape_text): Report unfinished entity
references as errors rather than running into an assert. (#80441)
2002-05-07 Michael Natterer <mitch@gimp.org> 2002-05-07 Michael Natterer <mitch@gimp.org>
* configure.in: added a new conditional CROSS_COMPILING which * configure.in: added a new conditional CROSS_COMPILING which

5
ChangeLog.pre-2-2
View File

@ -1,3 +1,8 @@
2002-05-07 Matthias Clasen <maclas@gmx.de>
* glib/gmarkup.c (unescape_text): Report unfinished entity
references as errors rather than running into an assert. (#80441)
2002-05-07 Michael Natterer <mitch@gimp.org> 2002-05-07 Michael Natterer <mitch@gimp.org>
* configure.in: added a new conditional CROSS_COMPILING which * configure.in: added a new conditional CROSS_COMPILING which

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
2002-05-07 Matthias Clasen <maclas@gmx.de>
* glib/gmarkup.c (unescape_text): Report unfinished entity
references as errors rather than running into an assert. (#80441)
2002-05-07 Michael Natterer <mitch@gimp.org> 2002-05-07 Michael Natterer <mitch@gimp.org>
* configure.in: added a new conditional CROSS_COMPILING which * configure.in: added a new conditional CROSS_COMPILING which

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
2002-05-07 Matthias Clasen <maclas@gmx.de>
* glib/gmarkup.c (unescape_text): Report unfinished entity
references as errors rather than running into an assert. (#80441)
2002-05-07 Michael Natterer <mitch@gimp.org> 2002-05-07 Michael Natterer <mitch@gimp.org>
* configure.in: added a new conditional CROSS_COMPILING which * configure.in: added a new conditional CROSS_COMPILING which

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
2002-05-07 Matthias Clasen <maclas@gmx.de>
* glib/gmarkup.c (unescape_text): Report unfinished entity
references as errors rather than running into an assert. (#80441)
2002-05-07 Michael Natterer <mitch@gimp.org> 2002-05-07 Michael Natterer <mitch@gimp.org>
* configure.in: added a new conditional CROSS_COMPILING which * configure.in: added a new conditional CROSS_COMPILING which

24
glib/gmarkup.c
View File

@ -592,9 +592,27 @@ unescape_text (GMarkupParseContext *context,
} }
} }
/* If no errors, we should have returned to USTATE_INSIDE_TEXT */ if (context->state != STATE_ERROR)
g_assert (context->state == STATE_ERROR || {
state == USTATE_INSIDE_TEXT); switch (state)
{
case USTATE_INSIDE_TEXT:
break;
case USTATE_AFTER_AMPERSAND:
case USTATE_INSIDE_ENTITY_NAME:
set_unescape_error (context, error,
NULL, NULL,
G_MARKUP_ERROR_PARSE,
_("Unfinished entity reference"));
break;
case USTATE_AFTER_CHARREF_HASH:
set_unescape_error (context, error,
NULL, NULL,
G_MARKUP_ERROR_PARSE,
_("Unfinished character reference"));
break;
}
}
if (context->state == STATE_ERROR) if (context->state == STATE_ERROR)
{ {