Commit 6853c2b8 authored by Matthias Clasen's avatar Matthias Clasen

Report unfinished entity references as errors rather than running into an

	* glib/gmarkup.c (unescape_text): Report unfinished entity
	references as errors rather than running into an assert.  (#80441)
parent 2038143a
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>
* configure.in: added a new conditional CROSS_COMPILING which
......
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>
* configure.in: added a new conditional CROSS_COMPILING which
......
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>
* configure.in: added a new conditional CROSS_COMPILING which
......
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>
* configure.in: added a new conditional CROSS_COMPILING which
......
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>
* configure.in: added a new conditional CROSS_COMPILING which
......
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>
* configure.in: added a new conditional CROSS_COMPILING which
......
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>
* configure.in: added a new conditional CROSS_COMPILING which
......
......@@ -592,9 +592,27 @@ unescape_text (GMarkupParseContext *context,
}
}
/* If no errors, we should have returned to USTATE_INSIDE_TEXT */
g_assert (context->state == STATE_ERROR ||
state == USTATE_INSIDE_TEXT);
if (context->state != STATE_ERROR)
{
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)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment