Fix bug #535 in cairo-script

cairo-script has a special case for drawing a set of rectangles. The
rectangle detection can trip over a "degenerate rectangle": Just a
horizontal line. It detects the line as the beginning of a rectangle and
then claims CAIRO_STATUS_INVALID_PATH_DATA when the other sides of the
rectangle are missing.

This commit simply changes the return value to
CAIRO_INT_STATUS_UNSUPPORTED to trigger a fallback to the generate case.

Test case is a straight-forward adaption from the original bug report.

Signed-off-by: Uli Schlachter <psychon@znc.in>
Fixes: https://gitlab.freedesktop.org/cairo/cairo/-/issues/535
This commit is contained in:
Uli Schlachter 2022-02-16 17:40:00 +01:00
parent bdb4d05868
commit 01c93c7f36
5 changed files with 54 additions and 1 deletions

View file

@ -1882,7 +1882,7 @@ _emit_path_boxes (cairo_script_surface_t *surface,
if (! _cairo_path_fixed_iter_at_end (&iter)) { if (! _cairo_path_fixed_iter_at_end (&iter)) {
_cairo_boxes_fini (&boxes); _cairo_boxes_fini (&boxes);
return CAIRO_STATUS_INVALID_PATH_DATA; return CAIRO_INT_STATUS_UNSUPPORTED;
} }
for (chunk = &boxes.chunks; chunk; chunk = chunk->next) { for (chunk = &boxes.chunks; chunk; chunk = chunk->next) {

View file

@ -28,6 +28,7 @@ test_sources = \
bug-361.c \ bug-361.c \
bug-431.c \ bug-431.c \
bug-448.c \ bug-448.c \
bug-535.c \
bug-51910.c \ bug-51910.c \
bug-75705.c \ bug-75705.c \
bug-84115.c \ bug-84115.c \

51
test/bug-535.c Normal file
View file

@ -0,0 +1,51 @@
/*
* Copyright © 2022 Uli Schlachter, Antony Lee
*
* 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: Uli Schlachter <psychon@znc.in>
*/
#include "cairo-test.h"
static cairo_test_status_t
draw (cairo_t *cr, int width, int height)
{
// Once upon a time, the "rectangle detection" in cairo-script was triggered
// by this degenerate rectangle and produces CAIRO_STATUS_INVALID_PATH_DATA.
cairo_move_to (cr, 0, 0);
cairo_line_to (cr, 9, 0);
cairo_fill (cr);
// Fill the whole surface so that argb32 and rgb24 can share a ref image
cairo_paint (cr);
return CAIRO_TEST_SUCCESS;
}
CAIRO_TEST (bug_535,
"Regression test for bug #535 in cairo-svg",
"degenerate", /* keywords */
NULL, /* requirements */
1, 1,
NULL, draw)

View file

@ -28,6 +28,7 @@ test_sources = [
'bug-361.c', 'bug-361.c',
'bug-431.c', 'bug-431.c',
'bug-448.c', 'bug-448.c',
'bug-535.c',
'bug-51910.c', 'bug-51910.c',
'bug-75705.c', 'bug-75705.c',
'bug-84115.c', 'bug-84115.c',

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 B