mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-02 09:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

scanner: Fail on more invalid XML files

Browse source 
These situations can happen if the XML is not valid according to the
Wayland DTD.

Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>
This commit is contained in:
Demi Marie Obenour 2022-11-08 01:44:41 -05:00 • committed by Demi Marie Obenour
parent cd5b4bcca7
commit 5802a083b4
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/scanner.c
View file

@ -784,6 +784,9 @@ start_element(void *data, const char *element_name, const char **atts)
if (version == 0) if (version == 0)
fail(&ctx->loc, "no interface version given"); fail(&ctx->loc, "no interface version given");
if (atts[4])
fail(&ctx->loc, "unexpected attribute on interface");
validate_identifier(&ctx->loc, name, STANDALONE_IDENT); validate_identifier(&ctx->loc, name, STANDALONE_IDENT);
interface = create_interface(ctx->loc, name, version); interface = create_interface(ctx->loc, name, version);
ctx->interface = interface; ctx->interface = interface;
@ -924,6 +927,9 @@ start_element(void *data, const char *element_name, const char **atts)
} else if (strcmp(element_name, "description") == 0) { } else if (strcmp(element_name, "description") == 0) {
if (summary == NULL) if (summary == NULL)
fail(&ctx->loc, "description without summary"); fail(&ctx->loc, "description without summary");
/* must be valid since summary attribute present */
if (atts[2])
fail(&ctx->loc, "description with non-summary attribute");
description = xzalloc(sizeof *description); description = xzalloc(sizeof *description);
description->summary = xstrdup(summary); description->summary = xstrdup(summary);
@ -939,6 +945,8 @@ start_element(void *data, const char *element_name, const char **atts)
else else
ctx->protocol->description = description; ctx->protocol->description = description;
ctx->description = description; ctx->description = description;
} else {
fail(&ctx->loc, "unknown element %s", element_name);
} }
} }