[cairo-commit] 2 commits - src/cairo-spans-compositor.c

[GitLab Mirror]

 src/cairo-spans-compositor.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 44f808fce9f437e14f2b0ef4e1583def8ab578ae
Merge: 33cce5dc3 e5b9d96f2
Author: Uli Schlachter <psychon at znc.in>
Date:   Thu Mar 25 15:51:32 2021 +0000

    Merge branch 'use-after-scope' into 'master'
    
    Avoid a use-after-scope
    
    Closes #453
    
    See merge request cairo/cairo!143

commit e5b9d96f22d5a0bdb27d0aafdd7f95d1d9ffbd67
Author: Uli Schlachter <psychon at znc.in>
Date:   Tue Mar 9 07:53:50 2021 +0100

    Avoid a use-after-scope
    
    This is the same fix as commit b345be5afee, but in a different place in
    the same file.
    
    Fixes: https://gitlab.freedesktop.org/cairo/cairo/-/issues/453
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/src/cairo-spans-compositor.c b/src/cairo-spans-compositor.c
index 5f956ca98..50c92b25c 100644
--- a/src/cairo-spans-compositor.c
+++ b/src/cairo-spans-compositor.c
@@ -1041,6 +1041,7 @@ _cairo_spans_compositor_stroke (const cairo_compositor_t	*_compositor,
 
     if (status == CAIRO_INT_STATUS_UNSUPPORTED) {
 	cairo_polygon_t polygon;
+	cairo_box_t limits;
 	cairo_fill_rule_t fill_rule = CAIRO_FILL_RULE_WINDING;
 
 	if (! _cairo_rectangle_contains_rectangle (&extents->unbounded,
@@ -1049,7 +1050,6 @@ _cairo_spans_compositor_stroke (const cairo_compositor_t	*_compositor,
 	    if (extents->clip->num_boxes == 1) {
 		_cairo_polygon_init (&polygon, extents->clip->boxes, 1);
 	    } else {
-		cairo_box_t limits;
 		_cairo_box_from_rectangle (&limits, &extents->unbounded);
 		_cairo_polygon_init (&polygon, &limits, 1);
 	    }