mirror of
https://github.com/storytold/harfbuzz.git
synced 2026-11-19 05:51:05 +01:00
[test/api] Fix a few ubsan issues
This commit is contained in:
1 parent
b43901151f
commit
fb04a306fc
5 files changed
+66
-53
No files matched your search
+3
-21
@@ -134,7 +134,7 @@ typedef GTestFixtureFunc hb_test_fixture_func_t;
|
||||
#else
|
||||
typedef void (*hb_test_func_t) (void);
|
||||
typedef void (*hb_test_data_func_t) (gconstpointer user_data);
|
||||
typedef void (*hb_test_fixture_func_t) (void);
|
||||
typedef void (*hb_test_fixture_func_t) (gpointer fixture, gconstpointer user_data);
|
||||
#endif
|
||||
|
||||
#if !GLIB_CHECK_VERSION(2,30,0)
|
||||
@@ -226,16 +226,7 @@ hb_test_add_vtable (const char *test_path,
|
||||
}
|
||||
#define hb_test_add_fixture(FixturePrefix, UserData, Func) \
|
||||
G_STMT_START { \
|
||||
typedef G_PASTE (FixturePrefix, _t) Fixture; \
|
||||
void (*add_vtable) (const char*, gsize, gconstpointer, \
|
||||
void (*) (Fixture*, gconstpointer), \
|
||||
void (*) (Fixture*, gconstpointer), \
|
||||
void (*) (Fixture*, gconstpointer)) \
|
||||
= (void (*) (const gchar *, gsize, gconstpointer, \
|
||||
void (*) (Fixture*, gconstpointer), \
|
||||
void (*) (Fixture*, gconstpointer), \
|
||||
void (*) (Fixture*, gconstpointer))) hb_test_add_vtable; \
|
||||
add_vtable (#Func, sizeof (G_PASTE (FixturePrefix, _t)), UserData, \
|
||||
hb_test_add_vtable (#Func, sizeof (G_PASTE (FixturePrefix, _t)), UserData, \
|
||||
G_PASTE (FixturePrefix, _init), Func, G_PASTE (FixturePrefix, _finish)); \
|
||||
} G_STMT_END
|
||||
|
||||
@@ -254,16 +245,7 @@ hb_test_add_vtable_flavor (const char *test_path,
|
||||
}
|
||||
#define hb_test_add_fixture_flavor(FixturePrefix, UserData, Flavor, Func) \
|
||||
G_STMT_START { \
|
||||
typedef G_PASTE (FixturePrefix, _t) Fixture; \
|
||||
void (*add_vtable) (const char*, const char *, gsize, gconstpointer, \
|
||||
void (*) (Fixture*, gconstpointer), \
|
||||
void (*) (Fixture*, gconstpointer), \
|
||||
void (*) (Fixture*, gconstpointer)) \
|
||||
= (void (*) (const gchar *, const char *, gsize, gconstpointer, \
|
||||
void (*) (Fixture*, gconstpointer), \
|
||||
void (*) (Fixture*, gconstpointer), \
|
||||
void (*) (Fixture*, gconstpointer))) hb_test_add_vtable_flavor; \
|
||||
add_vtable (#Func, Flavor, sizeof (G_PASTE (FixturePrefix, _t)), UserData, \
|
||||
hb_test_add_vtable_flavor (#Func, Flavor, sizeof (G_PASTE (FixturePrefix, _t)), UserData, \
|
||||
G_PASTE (FixturePrefix, _init), Func, G_PASTE (FixturePrefix, _finish)); \
|
||||
} G_STMT_END
|
||||
|
||||
|
||||
+17
-10
@@ -98,15 +98,17 @@ typedef struct
|
||||
} fixture_t;
|
||||
|
||||
static void
|
||||
free_up (fixture_t *fixture)
|
||||
free_up (void *fixture_)
|
||||
{
|
||||
fixture_t *fixture = (fixture_t *) fixture_;
|
||||
g_assert_cmpint (fixture->freed, ==, 0);
|
||||
fixture->freed++;
|
||||
}
|
||||
|
||||
static void
|
||||
free_up_free (fixture_t *fixture)
|
||||
free_up_free (void *fixture_)
|
||||
{
|
||||
fixture_t *fixture = (fixture_t *) fixture_;
|
||||
free_up (fixture);
|
||||
free (fixture->data);
|
||||
}
|
||||
@@ -132,8 +134,9 @@ get_pagesize (void)
|
||||
}
|
||||
|
||||
static void
|
||||
free_up_munmap (fixture_t *fixture)
|
||||
free_up_munmap (void *fixture_)
|
||||
{
|
||||
fixture_t *fixture = (fixture_t *) fixture_;
|
||||
free_up (fixture);
|
||||
munmap (fixture->data, get_pagesize ());
|
||||
}
|
||||
@@ -141,8 +144,9 @@ free_up_munmap (fixture_t *fixture)
|
||||
|
||||
#include <errno.h>
|
||||
static void
|
||||
fixture_init (fixture_t *fixture, gconstpointer user_data)
|
||||
fixture_init (gpointer fixture_, gconstpointer user_data)
|
||||
{
|
||||
fixture_t *fixture = (fixture_t *) fixture_;
|
||||
hb_memory_mode_t mm = (hb_memory_mode_t) GPOINTER_TO_INT (user_data);
|
||||
unsigned int len;
|
||||
const char *data;
|
||||
@@ -153,13 +157,13 @@ fixture_init (fixture_t *fixture, gconstpointer user_data)
|
||||
case HB_MEMORY_MODE_DUPLICATE:
|
||||
data = test_data;
|
||||
len = sizeof (test_data);
|
||||
free_func = (hb_destroy_func_t) free_up;
|
||||
free_func = free_up;
|
||||
break;
|
||||
|
||||
case HB_MEMORY_MODE_READONLY:
|
||||
data = test_data;
|
||||
len = sizeof (test_data);
|
||||
free_func = (hb_destroy_func_t) free_up;
|
||||
free_func = free_up;
|
||||
break;
|
||||
|
||||
case HB_MEMORY_MODE_WRITABLE:
|
||||
@@ -179,7 +183,7 @@ fixture_init (fixture_t *fixture, gconstpointer user_data)
|
||||
memcpy ((char *) data, test_data, sizeof (test_data));
|
||||
mprotect ((char *) data, pagesize, PROT_READ);
|
||||
len = sizeof (test_data);
|
||||
free_func = (hb_destroy_func_t) free_up_munmap;
|
||||
free_func = free_up_munmap;
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
@@ -195,16 +199,18 @@ fixture_init (fixture_t *fixture, gconstpointer user_data)
|
||||
}
|
||||
|
||||
static void
|
||||
fixture_finish (fixture_t *fixture, gconstpointer user_data HB_UNUSED)
|
||||
fixture_finish (gpointer fixture_, gconstpointer user_data HB_UNUSED)
|
||||
{
|
||||
fixture_t *fixture = (fixture_t *) fixture_;
|
||||
hb_blob_destroy (fixture->blob);
|
||||
g_assert_cmpint (fixture->freed, ==, 1);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
test_blob (fixture_t *fixture, gconstpointer user_data)
|
||||
test_blob (gpointer fixture_, gconstpointer user_data)
|
||||
{
|
||||
fixture_t *fixture = (fixture_t *) fixture_;
|
||||
hb_blob_t *b = fixture->blob;
|
||||
hb_memory_mode_t mm = GPOINTER_TO_INT (user_data);
|
||||
unsigned int len;
|
||||
@@ -262,8 +268,9 @@ test_blob (fixture_t *fixture, gconstpointer user_data)
|
||||
}
|
||||
|
||||
static void
|
||||
test_blob_subblob (fixture_t *fixture, gconstpointer user_data)
|
||||
test_blob_subblob (gpointer fixture_, gconstpointer user_data)
|
||||
{
|
||||
fixture_t *fixture = (fixture_t *) fixture_;
|
||||
hb_blob_t *b = fixture->blob;
|
||||
hb_memory_mode_t mm = GPOINTER_TO_INT (user_data);
|
||||
unsigned int len;
|
||||
|
||||
+12
-6
@@ -57,8 +57,9 @@ typedef struct
|
||||
} fixture_t;
|
||||
|
||||
static void
|
||||
fixture_init (fixture_t *fixture, gconstpointer user_data)
|
||||
fixture_init (gpointer fixture_, gconstpointer user_data)
|
||||
{
|
||||
fixture_t *fixture = fixture_;
|
||||
hb_buffer_t *b;
|
||||
unsigned int i;
|
||||
|
||||
@@ -92,15 +93,17 @@ fixture_init (fixture_t *fixture, gconstpointer user_data)
|
||||
}
|
||||
|
||||
static void
|
||||
fixture_finish (fixture_t *fixture, gconstpointer user_data HB_UNUSED)
|
||||
fixture_finish (gpointer fixture_, gconstpointer user_data HB_UNUSED)
|
||||
{
|
||||
fixture_t *fixture = fixture_;
|
||||
hb_buffer_destroy (fixture->buffer);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
test_buffer_properties (fixture_t *fixture, gconstpointer user_data HB_UNUSED)
|
||||
test_buffer_properties (gpointer fixture_, gconstpointer user_data HB_UNUSED)
|
||||
{
|
||||
fixture_t *fixture = fixture_;
|
||||
hb_buffer_t *b = fixture->buffer;
|
||||
hb_unicode_funcs_t *ufuncs;
|
||||
|
||||
@@ -177,8 +180,9 @@ test_buffer_properties (fixture_t *fixture, gconstpointer user_data HB_UNUSED)
|
||||
}
|
||||
|
||||
static void
|
||||
test_buffer_contents (fixture_t *fixture, gconstpointer user_data)
|
||||
test_buffer_contents (gpointer fixture_, gconstpointer user_data)
|
||||
{
|
||||
fixture_t *fixture = fixture_;
|
||||
hb_buffer_t *b = fixture->buffer;
|
||||
unsigned int i, len, len2;
|
||||
buffer_type_t buffer_type = GPOINTER_TO_INT (user_data);
|
||||
@@ -294,8 +298,9 @@ test_buffer_contents (fixture_t *fixture, gconstpointer user_data)
|
||||
}
|
||||
|
||||
static void
|
||||
test_buffer_positions (fixture_t *fixture, gconstpointer user_data HB_UNUSED)
|
||||
test_buffer_positions (gpointer fixture_, gconstpointer user_data HB_UNUSED)
|
||||
{
|
||||
fixture_t *fixture = fixture_;
|
||||
hb_buffer_t *b = fixture->buffer;
|
||||
unsigned int i, len, len2;
|
||||
hb_glyph_position_t *positions;
|
||||
@@ -319,8 +324,9 @@ test_buffer_positions (fixture_t *fixture, gconstpointer user_data HB_UNUSED)
|
||||
}
|
||||
|
||||
static void
|
||||
test_buffer_allocation (fixture_t *fixture, gconstpointer user_data HB_UNUSED)
|
||||
test_buffer_allocation (gpointer fixture_, gconstpointer user_data HB_UNUSED)
|
||||
{
|
||||
fixture_t *fixture = fixture_;
|
||||
hb_buffer_t *b = fixture->buffer;
|
||||
|
||||
g_assert_cmpint (hb_buffer_get_length (b), ==, 0);
|
||||
|
||||
+15
-10
@@ -98,49 +98,54 @@ test_itoa (void)
|
||||
}
|
||||
|
||||
static void
|
||||
move_to (HB_UNUSED hb_draw_funcs_t *dfuncs, draw_data_t *draw_data,
|
||||
move_to (HB_UNUSED hb_draw_funcs_t *dfuncs, void *draw_data_,
|
||||
HB_UNUSED hb_draw_state_t *st,
|
||||
HB_UNUSED float to_x, HB_UNUSED float to_y,
|
||||
HB_UNUSED void *user_data)
|
||||
{
|
||||
draw_data_t *draw_data = (draw_data_t *) draw_data_;
|
||||
draw_data->move_to_count++;
|
||||
}
|
||||
|
||||
static void
|
||||
line_to (HB_UNUSED hb_draw_funcs_t *dfuncs, draw_data_t *draw_data,
|
||||
line_to (HB_UNUSED hb_draw_funcs_t *dfuncs, void *draw_data_,
|
||||
HB_UNUSED hb_draw_state_t *st,
|
||||
HB_UNUSED float to_x, HB_UNUSED float to_y,
|
||||
HB_UNUSED void *user_data)
|
||||
{
|
||||
draw_data_t *draw_data = (draw_data_t *) draw_data_;
|
||||
draw_data->line_to_count++;
|
||||
}
|
||||
|
||||
static void
|
||||
quadratic_to (HB_UNUSED hb_draw_funcs_t *dfuncs, draw_data_t *draw_data,
|
||||
quadratic_to (HB_UNUSED hb_draw_funcs_t *dfuncs, void *draw_data_,
|
||||
HB_UNUSED hb_draw_state_t *st,
|
||||
HB_UNUSED float control_x, HB_UNUSED float control_y,
|
||||
HB_UNUSED float to_x, HB_UNUSED float to_y,
|
||||
HB_UNUSED void *user_data)
|
||||
{
|
||||
draw_data_t *draw_data = (draw_data_t *) draw_data_;
|
||||
draw_data->quad_to_count++;
|
||||
}
|
||||
|
||||
static void
|
||||
cubic_to (HB_UNUSED hb_draw_funcs_t *dfuncs, draw_data_t *draw_data,
|
||||
cubic_to (HB_UNUSED hb_draw_funcs_t *dfuncs, void *draw_data_,
|
||||
HB_UNUSED hb_draw_state_t *st,
|
||||
HB_UNUSED float control1_x, HB_UNUSED float control1_y,
|
||||
HB_UNUSED float control2_x, HB_UNUSED float control2_y,
|
||||
HB_UNUSED float to_x, HB_UNUSED float to_y,
|
||||
HB_UNUSED void *user_data)
|
||||
{
|
||||
draw_data_t *draw_data = (draw_data_t *) draw_data_;
|
||||
draw_data->cubic_to_count++;
|
||||
}
|
||||
|
||||
static void
|
||||
close_path (HB_UNUSED hb_draw_funcs_t *dfuncs, draw_data_t *draw_data,
|
||||
close_path (HB_UNUSED hb_draw_funcs_t *dfuncs, void *draw_data_,
|
||||
HB_UNUSED hb_draw_state_t *st,
|
||||
HB_UNUSED void *user_data)
|
||||
{
|
||||
draw_data_t *draw_data = (draw_data_t *) draw_data_;
|
||||
draw_data->close_path_count++;
|
||||
}
|
||||
|
||||
@@ -249,11 +254,11 @@ int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
funcs = hb_draw_funcs_create ();
|
||||
hb_draw_funcs_set_move_to_func (funcs, (hb_draw_move_to_func_t) move_to, NULL, NULL);
|
||||
hb_draw_funcs_set_line_to_func (funcs, (hb_draw_line_to_func_t) line_to, NULL, NULL);
|
||||
hb_draw_funcs_set_quadratic_to_func (funcs, (hb_draw_quadratic_to_func_t) quadratic_to, NULL, NULL);
|
||||
hb_draw_funcs_set_cubic_to_func (funcs, (hb_draw_cubic_to_func_t) cubic_to, NULL, NULL);
|
||||
hb_draw_funcs_set_close_path_func (funcs, (hb_draw_close_path_func_t) close_path, NULL, NULL);
|
||||
hb_draw_funcs_set_move_to_func (funcs, move_to, NULL, NULL);
|
||||
hb_draw_funcs_set_line_to_func (funcs, line_to, NULL, NULL);
|
||||
hb_draw_funcs_set_quadratic_to_func (funcs, quadratic_to, NULL, NULL);
|
||||
hb_draw_funcs_set_cubic_to_func (funcs, cubic_to, NULL, NULL);
|
||||
hb_draw_funcs_set_close_path_func (funcs, close_path, NULL, NULL);
|
||||
hb_draw_funcs_make_immutable (funcs);
|
||||
|
||||
hb_test_init (&argc, &argv);
|
||||
|
||||
+19
-6
@@ -577,13 +577,22 @@ typedef struct {
|
||||
unsigned int default_value;
|
||||
} property_t;
|
||||
|
||||
static unsigned _hb_unicode_combining_class (hb_unicode_funcs_t *ufuncs, hb_codepoint_t unicode)
|
||||
{ return (unsigned) hb_unicode_combining_class (ufuncs, unicode); }
|
||||
static unsigned _hb_unicode_general_category (hb_unicode_funcs_t *ufuncs, hb_codepoint_t unicode)
|
||||
{ return (unsigned) hb_unicode_general_category (ufuncs, unicode); }
|
||||
static unsigned _hb_unicode_mirroring (hb_unicode_funcs_t *ufuncs, hb_codepoint_t unicode)
|
||||
{ return (unsigned) hb_unicode_mirroring (ufuncs, unicode); }
|
||||
static unsigned _hb_unicode_script (hb_unicode_funcs_t *ufuncs, hb_codepoint_t unicode)
|
||||
{ return (unsigned) hb_unicode_script (ufuncs, unicode); }
|
||||
|
||||
#define RETURNS_UNICODE_ITSELF ((unsigned int) -1)
|
||||
|
||||
#define PROPERTY(name, DEFAULT) \
|
||||
{ \
|
||||
#name, \
|
||||
(func_setter_func_t) hb_unicode_funcs_set_##name##_func, \
|
||||
(getter_func_t) hb_unicode_##name, \
|
||||
_hb_unicode_##name, \
|
||||
name##_tests, \
|
||||
G_N_ELEMENTS (name##_tests), \
|
||||
name##_tests_more, \
|
||||
@@ -785,19 +794,21 @@ typedef struct {
|
||||
} data_fixture_t;
|
||||
|
||||
static void
|
||||
data_fixture_init (data_fixture_t *f, gconstpointer user_data HB_UNUSED)
|
||||
data_fixture_init (gpointer fixture, gconstpointer user_data HB_UNUSED)
|
||||
{
|
||||
data_fixture_t *f = (data_fixture_t *) fixture;
|
||||
f->data[0].value = MAGIC0;
|
||||
f->data[1].value = MAGIC1;
|
||||
}
|
||||
static void
|
||||
data_fixture_finish (data_fixture_t *f HB_UNUSED, gconstpointer user_data HB_UNUSED)
|
||||
data_fixture_finish (gpointer fixture HB_UNUSED, gconstpointer user_data HB_UNUSED)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
test_unicode_subclassing_nil (data_fixture_t *f, gconstpointer user_data HB_UNUSED)
|
||||
test_unicode_subclassing_nil (gpointer fixture, gconstpointer user_data HB_UNUSED)
|
||||
{
|
||||
data_fixture_t *f = (data_fixture_t *) fixture;
|
||||
hb_unicode_funcs_t *uf, *aa;
|
||||
|
||||
uf = hb_unicode_funcs_create (NULL);
|
||||
@@ -818,8 +829,9 @@ test_unicode_subclassing_nil (data_fixture_t *f, gconstpointer user_data HB_UNUS
|
||||
}
|
||||
|
||||
static void
|
||||
test_unicode_subclassing_default (data_fixture_t *f, gconstpointer user_data HB_UNUSED)
|
||||
test_unicode_subclassing_default (gpointer fixture, gconstpointer user_data HB_UNUSED)
|
||||
{
|
||||
data_fixture_t *f = (data_fixture_t *) fixture;
|
||||
hb_unicode_funcs_t *uf, *aa;
|
||||
|
||||
uf = hb_unicode_funcs_get_default ();
|
||||
@@ -837,8 +849,9 @@ test_unicode_subclassing_default (data_fixture_t *f, gconstpointer user_data HB_
|
||||
}
|
||||
|
||||
static void
|
||||
test_unicode_subclassing_deep (data_fixture_t *f, gconstpointer user_data HB_UNUSED)
|
||||
test_unicode_subclassing_deep (gpointer fixture, gconstpointer user_data HB_UNUSED)
|
||||
{
|
||||
data_fixture_t *f = (data_fixture_t *) fixture;
|
||||
hb_unicode_funcs_t *uf, *aa;
|
||||
|
||||
uf = hb_unicode_funcs_create (NULL);
|
||||
|
||||
Reference in new issue
Block a user