lib/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2026-10-24 00:49:00 +03:00
Code Activity

gdbusintrospection: Fix XML parser state handling for <node> element nesting

Browse Source 
The check for whether a `<node>` element in D-Bus introspection XML was
nested correctly was broken. `<node>` elements can only be at the top
level, or nested immediately within another `<node>` element.

Fix the check and add some unit tests for it.

Spotted by linhlhq as #YWH-PGM9867-204. The fix is mine, and the unit test
uses example XML strings adapted from their report.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>

Fixes: #3932
This commit is contained in:
Philip Withnall
2026-04-16 15:27:37 +01:00
parent 7b276f05f6
commit c9da977c17
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gdbusintrospection.c
View File

@@ -1266,7 +1266,7 @@ parser_start_element (GMarkupParseContext *context,
/* ---------------------------------------------------------------------------------------------------- */
if (strcmp (element_name, "node") == 0)
{
if (!(g_slist_length (stack) >= 1 || strcmp (stack->next->data, "node") != 0))
if (stack->next != NULL && strcmp (stack->next->data, "node") != 0)
{
g_set_error_literal (error,
G_MARKUP_ERROR,

33
gio/tests/gdbus-introspection.c
View File

@@ -300,6 +300,38 @@ test_extra_data (void)
g_dbus_node_info_unref (info);
}
static void
test_invalid (void)
{
const struct
{
const char *xml;
GMarkupError expected_error_code;
}
vectors[] =
{
{ "", G_MARKUP_ERROR_EMPTY },
{ "<node><interface name=\"I\"><method name=\"M\"><node><interface name=\"I2\"></interface></node></method>", G_MARKUP_ERROR_INVALID_CONTENT },
{ "<node><interface name=\"I\"><signal name=\"S\"><node><interface name=\"I2\"><signal name=\"S2\"></signal></interface></node></signal>", G_MARKUP_ERROR_INVALID_CONTENT },
{ "<node><interface name=\"I\"><property name=\"P\" type=\"s\" access=\"read\"><node><interface name=\"I2\"></interface></node></property>", G_MARKUP_ERROR_INVALID_CONTENT },
{ "<node><interface name=\"I\"><method name=\"M\"><arg type=\"\"><node><interface name=\"I2\"><method name=\"M2\"></method></interface></node></arg>", G_MARKUP_ERROR_INVALID_CONTENT },
};
for (size_t i = 0; i < G_N_ELEMENTS (vectors); i++)
{
GDBusNodeInfo *node;
GError *local_error = NULL;
g_test_message ("Testing parsing of %s gives an error", vectors[i].xml);
node = g_dbus_node_info_new_for_xml (vectors[i].xml, &local_error);
g_assert_error (local_error, G_MARKUP_ERROR, (int) vectors[i].expected_error_code);
g_assert_null (node);
g_clear_error (&local_error);
}
}
/* ---------------------------------------------------------------------------------------------------- */
int
@@ -317,6 +349,7 @@ main (int argc,
g_test_add_func ("/gdbus/introspection/generate", test_generate);
g_test_add_func ("/gdbus/introspection/default-direction", test_default_direction);
g_test_add_func ("/gdbus/introspection/extra-data", test_extra_data);
g_test_add_func ("/gdbus/introspection/invalid", test_invalid);
ret = session_bus_run ();