diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-01-20 02:43:43 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-01-20 02:43:43 +0000 |
commit | 59074f13f87f09f493b0534da302f915a3f67a8f (patch) | |
tree | 36bd01f6d0b4416780f94591557e559799d630f7 | |
parent | 0fe5b634963ca320485549f095683be3b3750168 (diff) | |
parent | b538d911d726ea72523413b75b864b52993fa178 (diff) | |
download | pango-59074f13f87f09f493b0534da302f915a3f67a8f.tar.gz |
Merge branch 'lsan_slice' into 'master'
Force malloc of g_slices in asan build
See merge request GNOME/pango!262
-rwxr-xr-x | .gitlab-ci/run-tests.sh | 2 | ||||
-rw-r--r-- | lsan.supp | 1 | ||||
-rw-r--r-- | tests/test-font.c | 5 | ||||
-rw-r--r-- | tests/test-itemize.c | 1 | ||||
-rw-r--r-- | tests/test-shape.c | 5 | ||||
-rw-r--r-- | tests/testboundaries_ucd.c | 1 | ||||
-rw-r--r-- | utils/pango-list.c | 1 |
7 files changed, 13 insertions, 3 deletions
diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh index e5c8e9af..73a1951f 100755 --- a/.gitlab-ci/run-tests.sh +++ b/.gitlab-ci/run-tests.sh @@ -8,6 +8,8 @@ builddir=$1 # Ignore memory leaks lower in dependencies export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp +# Check leaks of slices +export G_SLICE=always-malloc meson test -C ${builddir} \ --print-errorlogs \ @@ -1,5 +1,4 @@ leak:g_quark_init -leak:libc.so leak:libfontconfig.so leak:libcairo.so leak:libpixman-1.so diff --git a/tests/test-font.c b/tests/test-font.c index 486504f9..d02c7932 100644 --- a/tests/test-font.c +++ b/tests/test-font.c @@ -164,9 +164,12 @@ test_extents (void) PangoGlyphString *glyphs; PangoRectangle ink, log; PangoContext *context; + PangoFontDescription *desc; context = pango_font_map_create_context (pango_cairo_font_map_get_default ()); - pango_context_set_font_description (context, pango_font_description_from_string ("Cantarell 11")); + desc = pango_font_description_from_string("Cantarell 11"); + pango_context_set_font_description (context, desc); + pango_font_description_free (desc); items = pango_itemize (context, str, 0, strlen (str), NULL, NULL); glyphs = pango_glyph_string_new (); diff --git a/tests/test-itemize.c b/tests/test-itemize.c index dbe67e64..d1447a0f 100644 --- a/tests/test-itemize.c +++ b/tests/test-itemize.c @@ -279,6 +279,7 @@ test_itemize (gconstpointer d) g_free (diff); g_string_free (dump, TRUE); g_free (expected_file); + g_object_unref (context); } int diff --git a/tests/test-shape.c b/tests/test-shape.c index 043f3d31..be3e4415 100644 --- a/tests/test-shape.c +++ b/tests/test-shape.c @@ -361,7 +361,10 @@ main (int argc, char *argv[]) g_free (path); if (g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) - return 0; + { + g_error_free (error); + return 0; + } g_assert_no_error (error); while ((name = g_dir_read_name (dir)) != NULL) diff --git a/tests/testboundaries_ucd.c b/tests/testboundaries_ucd.c index 18ab94cc..0cd301f7 100644 --- a/tests/testboundaries_ucd.c +++ b/tests/testboundaries_ucd.c @@ -233,6 +233,7 @@ do_test (const gchar *filename, if (g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) { g_test_skip ("Test file not found"); + g_error_free (error); return; } diff --git a/utils/pango-list.c b/utils/pango-list.c index 3d360975..6e81fd6e 100644 --- a/utils/pango-list.c +++ b/utils/pango-list.c @@ -200,6 +200,7 @@ main (int argc, g_free (faces); } g_free (families); + g_object_unref (ctx); g_object_unref (fontmap); return 0; |