fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-03-17 18:20:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test/marshal: Ensure we use suitably aligned buffers

Browse source 
This test was failing on s390; though it could fail
on other platforms too.  Basically we need to be sure
we're passing at least word-aligned buffers to the
demarshalling code.  malloc() will do that for us.

https://bugs.freedesktop.org/show_bug.cgi?id=67279
This commit is contained in:
Colin Walters 2013-07-24 21:48:58 +01:00
parent d9dc58efce
commit b4ffcdc5eb
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
test/marshal.c
View file

@ -27,6 +27,7 @@
#include <config.h>
#include <glib.h>
#include <string.h>
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
@ -244,14 +245,30 @@ int
main (int argc,
char **argv)
{
int ret;
char *aligned_le_blob;
char *aligned_be_blob;
g_test_init (&argc, &argv, NULL);
g_test_add ("/demarshal/le", Fixture, le_blob, setup, test_endian, teardown);
g_test_add ("/demarshal/be", Fixture, be_blob, setup, test_endian, teardown);
g_test_add ("/demarshal/needed/le", Fixture, le_blob, setup, test_needed,
/* We have to pass in a buffer that's at least "default aligned",
* i.e. on GNU systems to 8 or 16. The linker may have only given
* us byte-alignment for the char[] static variables.
*/
aligned_le_blob = g_malloc (sizeof (le_blob));
memcpy (aligned_le_blob, le_blob, sizeof (le_blob));
aligned_be_blob = g_malloc (sizeof (be_blob));
memcpy (aligned_be_blob, be_blob, sizeof (be_blob));
g_test_add ("/demarshal/le", Fixture, aligned_le_blob, setup, test_endian, teardown);
g_test_add ("/demarshal/be", Fixture, aligned_be_blob, setup, test_endian, teardown);
g_test_add ("/demarshal/needed/le", Fixture, aligned_le_blob, setup, test_needed,
teardown);
g_test_add ("/demarshal/needed/be", Fixture, be_blob, setup, test_needed,
g_test_add ("/demarshal/needed/be", Fixture, aligned_be_blob, setup, test_needed,
teardown);
return g_test_run ();
ret = g_test_run ();
g_free (aligned_le_blob);
g_free (aligned_be_blob);
return ret;
}