diff options
| -rw-r--r-- | pango/pango-context.c | 2 | ||||
| -rw-r--r-- | tests/testmisc.c | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/pango/pango-context.c b/pango/pango-context.c index 7772878f..bebe804a 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -1566,7 +1566,7 @@ pango_itemize_with_base_dir (PangoContext *context, g_return_val_if_fail (length >= 0, NULL); g_return_val_if_fail (length == 0 || text != NULL, NULL); - if (length == 0) + if (length == 0 || g_utf8_strlen (text, length) == 0) return NULL; itemize_state_init (&state, context, text, base_dir, start_index, length, diff --git a/tests/testmisc.c b/tests/testmisc.c index a078944d..f5583cab 100644 --- a/tests/testmisc.c +++ b/tests/testmisc.c @@ -41,12 +41,26 @@ test_shape_tab_crash (void) g_object_unref (context); } +/* Test that itemizing a string with 0 characters works + */ +static void +test_itemize_empty_crash (void) +{ + PangoContext *context; + + context = pango_font_map_create_context (pango_cairo_font_map_get_default ()); + pango_itemize_with_base_dir (context, PANGO_DIRECTION_LTR, "", 0, 1, NULL, NULL); + + g_object_unref (context); +} + int main (int argc, char *argv[]) { g_test_init (&argc, &argv, NULL); g_test_add_func ("/layout/shape-tab-crash", test_shape_tab_crash); + g_test_add_func ("/layout/itemize-empty-crash", test_itemize_empty_crash); return g_test_run (); } |