AuroraMiddleware/harfbuzz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[test/buffer] Add test pre_alloc(); hangs in the buffer code right now

Browse Source 
Because the following loop overflows:

  while (size > new_allocated)
      new_allocated += (new_allocated >> 1) + 32;
This commit is contained in:
Behdad Esfahbod 2011-04-28 12:28:54 -04:00
parent 1e5527e2d6
commit 15c57e04bf
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
test/test-buffer.c
View File

@ -53,10 +53,10 @@ static const char *buffer_names[] = {
typedef struct typedef struct
{ {
hb_buffer_t *b; hb_buffer_t *b;
} Fixture; } fixture_t;
static void static void
fixture_init (Fixture *fixture, gconstpointer user_data) fixture_init (fixture_t *fixture, gconstpointer user_data)
{ {
unsigned int i; unsigned int i;
@ -89,14 +89,14 @@ fixture_init (Fixture *fixture, gconstpointer user_data)
} }
static void static void
fixture_fini (Fixture *fixture, gconstpointer user_data) fixture_fini (fixture_t *fixture, gconstpointer user_data)
{ {
hb_buffer_destroy (fixture->b); hb_buffer_destroy (fixture->b);
} }
static void static void
test_buffer_properties (Fixture *fixture, gconstpointer user_data) test_buffer_properties (fixture_t *fixture, gconstpointer user_data)
{ {
hb_unicode_funcs_t *ufuncs; hb_unicode_funcs_t *ufuncs;
@ -135,7 +135,7 @@ test_buffer_properties (Fixture *fixture, gconstpointer user_data)
} }
static void static void
test_buffer_contents (Fixture *fixture, gconstpointer user_data) test_buffer_contents (fixture_t *fixture, gconstpointer user_data)
{ {
unsigned int i, len, len2; unsigned int i, len, len2;
buffer_type_t buffer_type = GPOINTER_TO_INT (user_data); buffer_type_t buffer_type = GPOINTER_TO_INT (user_data);
@ -241,6 +241,9 @@ test_buffer_contents (Fixture *fixture, gconstpointer user_data)
g_assert_cmphex (glyphs[i].codepoint, ==, utf32[1+i]); g_assert_cmphex (glyphs[i].codepoint, ==, utf32[1+i]);
g_assert (hb_buffer_allocation_successful (fixture->b));
/* test reset clears content */ /* test reset clears content */
hb_buffer_reset (fixture->b); hb_buffer_reset (fixture->b);
@ -248,7 +251,7 @@ test_buffer_contents (Fixture *fixture, gconstpointer user_data)
} }
static void static void
test_buffer_positions (Fixture *fixture, gconstpointer user_data) test_buffer_positions (fixture_t *fixture, gconstpointer user_data)
{ {
unsigned int i, len, len2; unsigned int i, len, len2;
hb_glyph_position_t *positions; hb_glyph_position_t *positions;
@ -271,6 +274,20 @@ test_buffer_positions (Fixture *fixture, gconstpointer user_data)
g_assert_cmpint (hb_buffer_get_length (fixture->b), ==, 0); g_assert_cmpint (hb_buffer_get_length (fixture->b), ==, 0);
} }
static void
test_buffer_allocation (fixture_t *fixture, gconstpointer user_data)
{
g_assert_cmpint (hb_buffer_get_length (fixture->b), ==, 0);
g_assert (hb_buffer_pre_allocate (fixture->b, 100));
g_assert_cmpint (hb_buffer_get_length (fixture->b), ==, 0);
/* lets try a huge allocation, make sure it fails */
g_assert (!hb_buffer_pre_allocate (fixture->b, (unsigned int) -1));
g_assert_cmpint (hb_buffer_get_length (fixture->b), ==, 0);
}
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
@ -282,7 +299,7 @@ main (int argc, char **argv)
#define TEST_ADD(path, func) \ #define TEST_ADD(path, func) \
G_STMT_START { \ G_STMT_START { \
char *s = g_strdup_printf ("%s/%s", path, buffer_names[i]); \ char *s = g_strdup_printf ("%s/%s", path, buffer_names[i]); \
g_test_add (s, Fixture, GINT_TO_POINTER (i), fixture_init, func, fixture_fini); \ g_test_add (s, fixture_t, GINT_TO_POINTER (i), fixture_init, func, fixture_fini); \
g_free (s); \ g_free (s); \
} G_STMT_END } G_STMT_END
TEST_ADD ("/buffer/properties", test_buffer_properties); TEST_ADD ("/buffer/properties", test_buffer_properties);
@ -291,6 +308,8 @@ main (int argc, char **argv)
#undef TEST_ADD #undef TEST_ADD
} }
g_test_add ("/buffer/allocation", fixture_t, GINT_TO_POINTER (BUFFER_EMPTY), fixture_init, test_buffer_allocation, fixture_fini);
/* XXX test invalid UTF-8 / UTF-16 text input (also overlong sequences) */ /* XXX test invalid UTF-8 / UTF-16 text input (also overlong sequences) */
/* XXX test pre_allocate(), allocation_successful(), and memory management */ /* XXX test pre_allocate(), allocation_successful(), and memory management */