From d517773ff145d06c5b9efb21841fbc95caf5f540 Mon Sep 17 00:00:00 2001 From: Koichi Akabe Date: Tue, 6 Feb 2024 22:18:06 +0900 Subject: [PATCH 1/4] Fix "out of memory" when using linear gradient --- src/cairo-pattern.c | 6 +++++ test/gradient-scale-crash.c | 49 +++++++++++++++++++++++++++++++++++++ test/meson.build | 1 + 3 files changed, 56 insertions(+) create mode 100644 test/gradient-scale-crash.c diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c index fcaaf46b8..742c51b2e 100644 --- a/src/cairo-pattern.c +++ b/src/cairo-pattern.c @@ -2801,6 +2801,12 @@ _cairo_gradient_pattern_fit_to_range (const cairo_gradient_pattern_t *gradient, dim = MAX (dim, fabs (radial->cd1.center.y - radial->cd2.center.y)); dim = MAX (dim, fabs (radial->cd1.radius - radial->cd2.radius)); } + dim = MAX (dim, fabs (gradient->base.matrix.xx)); + dim = MAX (dim, fabs (gradient->base.matrix.xy)); + dim = MAX (dim, fabs (gradient->base.matrix.x0)); + dim = MAX (dim, fabs (gradient->base.matrix.yx)); + dim = MAX (dim, fabs (gradient->base.matrix.yy)); + dim = MAX (dim, fabs (gradient->base.matrix.y0)); if (unlikely (dim > max_value)) { cairo_matrix_t scale; diff --git a/test/gradient-scale-crash.c b/test/gradient-scale-crash.c new file mode 100644 index 000000000..bf005cd38 --- /dev/null +++ b/test/gradient-scale-crash.c @@ -0,0 +1,49 @@ +/* + * Copyright © 2024 Koichi Akabe + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + * + * Author: Koichi Akabe + */ + +#include "cairo-test.h" + +static cairo_test_status_t +draw (cairo_t *cr, int width, int height) +{ + cairo_pattern_t *p = cairo_pattern_create_linear(0, 0, 0, 100); + cairo_pattern_add_color_stop_rgb(p, 0, 1, 1, 1); + cairo_pattern_add_color_stop_rgb(p, 1, 1, 0, 0); + cairo_matrix_t m; + cairo_matrix_init(&m, 100000, 0, 0, 100000, 0, 0); + cairo_pattern_set_matrix(p, &m); + cairo_set_source(cr, p); + cairo_rectangle(cr, 0, 0, 100, 100); + cairo_paint(cr); + return CAIRO_TEST_SUCCESS; +} + +CAIRO_TEST (gradient_scale_crash, + "Exercises a bug found in scaling gradient pattern", + "gradient, pattern", /* keywords */ + NULL, /* requirements */ + 0, 0, + NULL, draw) diff --git a/test/meson.build b/test/meson.build index d7834438f..dff2f2efe 100644 --- a/test/meson.build +++ b/test/meson.build @@ -160,6 +160,7 @@ test_sources = [ 'get-path-extents.c', 'gradient-alpha.c', 'gradient-constant-alpha.c', + 'gradient-scale-crash.c', 'gradient-zero-stops.c', 'gradient-zero-stops-mask.c', 'group-clip.c', From 3a06998b6ad9e5226854c1e90dcfe4a5bcf69052 Mon Sep 17 00:00:00 2001 From: Koichi Akabe Date: Wed, 7 Feb 2024 00:19:13 +0900 Subject: [PATCH 2/4] Destroy used pattern --- test/gradient-scale-crash.c | 1 + 1 file changed, 1 insertion(+) diff --git a/test/gradient-scale-crash.c b/test/gradient-scale-crash.c index bf005cd38..269b6a457 100644 --- a/test/gradient-scale-crash.c +++ b/test/gradient-scale-crash.c @@ -38,6 +38,7 @@ draw (cairo_t *cr, int width, int height) cairo_set_source(cr, p); cairo_rectangle(cr, 0, 0, 100, 100); cairo_paint(cr); + cairo_pattern_destroy(p); return CAIRO_TEST_SUCCESS; } From ad93bbad1933efe11986be8614e3f8192d2dd2f9 Mon Sep 17 00:00:00 2001 From: Koichi Akabe Date: Wed, 7 Feb 2024 23:21:13 +0900 Subject: [PATCH 3/4] coding style --- test/gradient-scale-crash.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/test/gradient-scale-crash.c b/test/gradient-scale-crash.c index 269b6a457..b073dc1b3 100644 --- a/test/gradient-scale-crash.c +++ b/test/gradient-scale-crash.c @@ -29,16 +29,21 @@ static cairo_test_status_t draw (cairo_t *cr, int width, int height) { - cairo_pattern_t *p = cairo_pattern_create_linear(0, 0, 0, 100); - cairo_pattern_add_color_stop_rgb(p, 0, 1, 1, 1); - cairo_pattern_add_color_stop_rgb(p, 1, 1, 0, 0); + cairo_pattern_t *p = cairo_pattern_create_linear (0, 0, 0, 100); + + cairo_pattern_add_color_stop_rgb (p, 0, 1, 1, 1); + cairo_pattern_add_color_stop_rgb (p, 1, 1, 0, 0); + cairo_matrix_t m; - cairo_matrix_init(&m, 100000, 0, 0, 100000, 0, 0); - cairo_pattern_set_matrix(p, &m); - cairo_set_source(cr, p); - cairo_rectangle(cr, 0, 0, 100, 100); - cairo_paint(cr); - cairo_pattern_destroy(p); + cairo_matrix_init (&m, 100000, 0, 0, 100000, 0, 0); + cairo_pattern_set_matrix (p, &m); + + cairo_set_source (cr, p); + cairo_rectangle (cr, 0, 0, 100, 100); + cairo_paint (cr); + + cairo_pattern_destroy (p); + return CAIRO_TEST_SUCCESS; } From 820bb0ba7f5d9f916594219d4093073d33253ba1 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 21 May 2024 22:43:36 +0000 Subject: [PATCH 4/4] Apply 1 suggestion(s) to 1 file(s) Co-authored-by: Emmanuele Bassi --- test/gradient-scale-crash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/gradient-scale-crash.c b/test/gradient-scale-crash.c index b073dc1b3..b265e429b 100644 --- a/test/gradient-scale-crash.c +++ b/test/gradient-scale-crash.c @@ -48,7 +48,7 @@ draw (cairo_t *cr, int width, int height) } CAIRO_TEST (gradient_scale_crash, - "Exercises a bug found in scaling gradient pattern", + "Verify fix for https://gitlab.freedesktop.org/cairo/cairo/-/issues/789", "gradient, pattern", /* keywords */ NULL, /* requirements */ 0, 0,