andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Xi: when deleting all properties, reset property handler to NULL.

Browse Source 
Trying to unregister property handlers during the device closure process
leads to invalid memory accesses.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Peter Hutterer 2009-11-24 15:31:48 +10:00
parent 8806375ed7
commit 1b127ab842
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xi/xiproperty.c
View File

@ -630,6 +630,8 @@ XIDeleteAllDeviceProperties (DeviceIntPtr device)
xfree(curr_handler); xfree(curr_handler);
curr_handler = next_handler; curr_handler = next_handler;
} }
device->properties.handlers = NULL;
} }

54
test/input.c
View File

@ -716,6 +716,59 @@ static void include_byte_padding_macros(void)
} }
static void xi_unregister_handlers(void)
{
DeviceIntRec dev;
int handler;
memset(&dev, 0, sizeof(dev));
handler = XIRegisterPropertyHandler(&dev, NULL, NULL, NULL);
g_assert(handler == 1);
handler = XIRegisterPropertyHandler(&dev, NULL, NULL, NULL);
g_assert(handler == 2);
handler = XIRegisterPropertyHandler(&dev, NULL, NULL, NULL);
g_assert(handler == 3);
g_test_message("Unlinking from front.");
XIUnregisterPropertyHandler(&dev, 4); /* NOOP */
g_assert(dev.properties.handlers->id == 3);
XIUnregisterPropertyHandler(&dev, 3);
g_assert(dev.properties.handlers->id == 2);
XIUnregisterPropertyHandler(&dev, 2);
g_assert(dev.properties.handlers->id == 1);
XIUnregisterPropertyHandler(&dev, 1);
g_assert(dev.properties.handlers == NULL);
handler = XIRegisterPropertyHandler(&dev, NULL, NULL, NULL);
g_assert(handler == 4);
handler = XIRegisterPropertyHandler(&dev, NULL, NULL, NULL);
g_assert(handler == 5);
handler = XIRegisterPropertyHandler(&dev, NULL, NULL, NULL);
g_assert(handler == 6);
XIUnregisterPropertyHandler(&dev, 3); /* NOOP */
g_assert(dev.properties.handlers->next->next->next == NULL);
XIUnregisterPropertyHandler(&dev, 4);
g_assert(dev.properties.handlers->next->next == NULL);
XIUnregisterPropertyHandler(&dev, 5);
g_assert(dev.properties.handlers->next == NULL);
XIUnregisterPropertyHandler(&dev, 6);
g_assert(dev.properties.handlers == NULL);
handler = XIRegisterPropertyHandler(&dev, NULL, NULL, NULL);
g_assert(handler == 7);
handler = XIRegisterPropertyHandler(&dev, NULL, NULL, NULL);
g_assert(handler == 8);
handler = XIRegisterPropertyHandler(&dev, NULL, NULL, NULL);
g_assert(handler == 9);
XIDeleteAllDeviceProperties(&dev);
g_assert(dev.properties.handlers == NULL);
XIUnregisterPropertyHandler(&dev, 7); /* NOOP */
}
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
g_test_init(&argc, &argv,NULL); g_test_init(&argc, &argv,NULL);
@ -727,6 +780,7 @@ int main(int argc, char** argv)
g_test_add_func("/dix/input/xi2-struct-sizes", xi2_struct_sizes); g_test_add_func("/dix/input/xi2-struct-sizes", xi2_struct_sizes);
g_test_add_func("/dix/input/grab_matching", dix_grab_matching); g_test_add_func("/dix/input/grab_matching", dix_grab_matching);
g_test_add_func("/include/byte_padding_macros", include_byte_padding_macros); g_test_add_func("/include/byte_padding_macros", include_byte_padding_macros);
g_test_add_func("/Xi/xiproperty/register-unregister", xi_unregister_handlers);
return g_test_run(); return g_test_run();
} }