[cairo-commit] 2 commits - src/cairo-recording-surface.c test/bug-448.c test/Makefile.sources

[GitLab Mirror]

 src/cairo-recording-surface.c |    8 ++--
 test/Makefile.sources         |    1 
 test/bug-448.c                |   76 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 81 insertions(+), 4 deletions(-)

New commits:
commit 7ac8220c1fd4afb259e53b7a5cd93a23859bdbda
Merge: ed7e51eb4 a1dc600a0
Author: Heiko Lewin <hlewin at gmx.de>
Date:   Mon Jan 4 15:12:38 2021 +0000

    Merge branch 'fix-copy-paste-error-in-recording-surfaces' into 'master'
    
    Fix copying tags in a recording surface
    
    Closes #448
    
    See merge request cairo/cairo!93

commit a1dc600a07f89b9c08ffa8c25dc92f75fec10dd6
Author: Uli Schlachter <psychon at znc.in>
Date:   Sat Dec 26 16:17:58 2020 +0100

    Fix copying tags in a recording surface
    
    The code was copying from the wrong member of an union. This caused a
    huge num_dashes value to be read, which then caused a so large memory
    allocation that malloc returned an error.
    
    Fixes: https://gitlab.freedesktop.org/cairo/cairo/-/issues/448
    Signed-off-by: Uli Schlachter <psychon at znc.in>

diff --git a/src/cairo-recording-surface.c b/src/cairo-recording-surface.c
index 6df8b0821..393eecca5 100644
--- a/src/cairo-recording-surface.c
+++ b/src/cairo-recording-surface.c
@@ -1456,17 +1456,17 @@ _cairo_recording_surface_copy__tag (cairo_recording_surface_t *surface,
 	    command->attributes = strdup (src->tag.attributes);
 
 	status = _cairo_pattern_init_copy (&command->source.base,
-					   &src->stroke.source.base);
+					   &src->tag.source.base);
 	if (unlikely (status))
 	    goto err_command;
 
 	status = _cairo_stroke_style_init_copy (&command->style,
-						&src->stroke.style);
+						&src->tag.style);
 	if (unlikely (status))
 	    goto err_source;
 
-	command->ctm = src->stroke.ctm;
-	command->ctm_inverse = src->stroke.ctm_inverse;
+	command->ctm = src->tag.ctm;
+	command->ctm_inverse = src->tag.ctm_inverse;
     }
 
     status = _cairo_recording_surface_commit (surface, &command->header);
diff --git a/test/Makefile.sources b/test/Makefile.sources
index 86494348d..1a04ae03b 100644
--- a/test/Makefile.sources
+++ b/test/Makefile.sources
@@ -25,6 +25,7 @@ test_sources = \
 	big-trap.c					\
 	bilevel-image.c					\
 	bug-40410.c					\
+	bug-448.c					\
 	bug-51910.c					\
 	bug-75705.c					\
 	bug-84115.c					\
diff --git a/test/bug-448.c b/test/bug-448.c
new file mode 100644
index 000000000..1a459ab5f
--- /dev/null
+++ b/test/bug-448.c
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2020 Ben Pfaff & Uli Schlachter
+ *
+ * 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.
+ *
+ * Authors:
+ *   Ben Pfaff <blp at cs.stanford.edu>
+ *   Uli Schlachter <psychon at znc.in>
+ */
+
+#include "cairo-test.h"
+
+static cairo_surface_t*
+draw_recording ()
+{
+    cairo_surface_t *recording;
+    cairo_rectangle_t extents;
+    cairo_t *cr;
+
+    extents.x = 0;
+    extents.y = 0;
+    extents.width = 10;
+    extents.height = 10;
+
+    recording = cairo_recording_surface_create (CAIRO_CONTENT_COLOR_ALPHA, &extents);
+
+    cr = cairo_create(recording);
+    cairo_tag_begin (cr, CAIRO_TAG_DEST, "name='dest'");
+    cairo_rectangle (cr, 3, 3, 4, 4);
+    cairo_stroke (cr);
+    cairo_tag_end (cr, CAIRO_TAG_DEST);
+    cairo_destroy(cr);
+
+    return recording;
+}
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+    cairo_surface_t *recording;
+
+    cairo_set_source_rgb (cr, 1, 1, 1);
+    cairo_paint (cr);
+
+    recording = draw_recording ();
+    cairo_set_source_surface (cr, recording, 0, 0);
+    cairo_paint (cr);
+    cairo_surface_destroy (recording);
+
+    return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (bug_448,
+	    "Exercises a bug with the tag API",
+	    "pdf", /* keywords */
+	    NULL, /* requirements */
+	    10, 10,
+	    NULL, draw)