From 6f569e076e3777cd3baf21ee7005b921a5918319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Mon, 11 Oct 2021 06:29:20 +0200 Subject: [PATCH] sdtui: further improve the XML mangler Comments should be more or less reliably handled by GMarkup now. --- src/sdtui.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/sdtui.c b/src/sdtui.c index efdcd2b..3e74eeb 100644 --- a/src/sdtui.c +++ b/src/sdtui.c @@ -353,8 +353,10 @@ view_entry_split_add_xdxf (ViewEntry *ve, const gchar *xml) GString *filtered = g_string_new (""); while (*xml) { + // GMarkup can read some of the wilder XML constructs, Pango skips them const gchar *p = NULL; - if (*xml != '<' || !*(p = xml + 1 + (xml[1] == '/')) + if (*xml != '<' || xml[1] == '!' || xml[1] == '?' + || g_ascii_isspace (xml[1]) || !*(p = xml + 1 + (xml[1] == '/')) || (strchr ("biu", *p) && p[1] == '>') || !(p = strchr (p, '>'))) g_string_append_c (filtered, *xml++); else if (xml[1] != 'k' || xml[2] != '>' || !(xml = strstr (p, "")))