Commit graph

11861 commits

Author SHA1 Message Date
Uli Schlachter
553c19df16 Merge branch 'meson-add-option-to-disable-xlib-xcb' into 'master'
meson: add xlib-xcb option and disable by default

Closes #438

See merge request cairo/cairo!132
2021-02-25 06:57:31 +00:00
Jan Alexander Steffens (heftig)
3468c67fe9 meson: add xlib-xcb option and disable by default
Just like autotools does.

Closes #438.
2021-02-25 01:29:53 +00:00
Uli Schlachter
8d2f3f4afc Merge branch 'meson-force-utf8-file-encoding-in-scripts' into 'master'
meson: use encoding=utf-8 when reading/writing files in helper script

See merge request cairo/cairo!129
2021-02-24 15:14:45 +00:00
Tim-Philipp Müller
784be5d859 Merge branch 'alatiera/cairo-header' into 'master'
meson: declare dependancy on libcairo_dep for overrides

See merge request cairo/cairo!130
2021-02-24 14:27:54 +00:00
Tim-Philipp Müller
f7ac4181d6 meson: declare dependancy on libcairo_dep for overrides
When declaring a dependency on a feature, say `dependency('cairo-png')`
the resulting object did not depend on cairo and thus was missing
basic things like, `cairo.h` from its include dir.

Make it so overrides do in fact include the basic cairo functionality
needed for them to work.

Related:
https://gitlab.freedesktop.org/gstreamer/gst-devtools/-/merge_requests/236
2021-02-24 03:03:07 +02:00
Tim-Philipp Müller
9732f4e80f meson: use encoding=utf-8 when reading/writing files in helper script
Fixes errors such as

Traceback (most recent call last):
  File "C:\Users\...\cairo\test\make-cairo-test-constructors.py", line 19, in <module>
    for l in f.readlines():
  File "c:\python39\lib\encodings\cp1253.py", line 23, in decode
    return codecs.charmap_decode(input,self.errors,decoding_table)[0]
UnicodeDecodeError: 'charmap' codec can't decode byte 0x98 in position 6694: character maps to <undefined>

on non-English-language Windows locales/installations.
2021-02-23 23:42:11 +00:00
Uli Schlachter
d85738b39c Merge branch 'utils-cairo-trace-update-for-new-bfd' into 'master'
cairo-trace: fix build with newer bfd and remove backtrace-symbols.c

Closes #391 and #460

See merge request cairo/cairo!128
2021-02-23 13:19:00 +00:00
Tim-Philipp Müller
0ed1053d8f utils: remove hacky replacement for backtrace_symbols in glibc
Doesn't build any more, is very much non-essential, and hasn't
been touched in any meaningful way since it was added 13 years
ago, so just remove it for now until someone steps up. Chances
are the glibc version has improved since then.
2021-02-23 12:29:58 +00:00
Tim-Philipp Müller
e30259f623 cairo-trace: fix build with newer versions of bfd
And update configure/meson checks to check for the new function.

Drop libiberty.h check since it's only needed by backtrace-symbols.c
which we're about to remove.

Closes #391, #460
2021-02-23 12:29:58 +00:00
Uli Schlachter
d6c1787ac1 Merge branch 'meson-symbol-lookup-option' into 'master'
meson: add symbol-lookup option to allow disabling bfd/libiberty usage

See merge request cairo/cairo!127
2021-02-23 11:33:45 +00:00
Tim-Philipp Müller
e0cf7b869f meson: add symbol-lookup option to allow disabling bfd/libiberty usage
Can be used to workaround build issues caused by changes
in the bfd API until those have been resolved.

https://gitlab.freedesktop.org/cairo/cairo/-/issues/460
https://gitlab.freedesktop.org/cairo/cairo/-/issues/391
2021-02-23 10:35:42 +00:00
Heiko Lewin
9e84988f41 Merge branch 'fix-448-test' into 'master'
Make the test case for bug 448 pass

See merge request cairo/cairo!123
2021-02-21 16:09:28 +00:00
Heiko Lewin
1569dcd4d8 Merge branch 'ubsan-fixes' into 'master'
UBSan fixes in cairo-truetype-subset.c

See merge request cairo/cairo!124
2021-02-21 16:01:41 +00:00
Jonathan Kew
967ac93789 Don't call _cairo_array_append_multiple with a zero count.
The documentation for _cairo_array_append_multiple says "one or more items".
If it is called with num_elements=0, it ends up calling _cairo_array_grow_by
with num_elements=0, which if the array is currently empty (as here) leads
to undefined behavior in _cairo_array_allocate in the line

    *elements = array->elements + array->num_elements * array->element_size;

because it ends up trying to add 0 to a null pointer. C doesn't allow this.
(UBSan flags this as "applying zero offset to null pointer".)
2021-02-21 16:01:40 +00:00
Heiko Lewin
c62c43a8c6 Merge branch 'pdf-tag-leak' into 'master'
Fix a memory leak with cairo_tag_begin() + pdf

See merge request cairo/cairo!126
2021-02-21 15:50:34 +00:00
Heiko Lewin
f4e43b6822 Merge branch 'pdf-font-names' into 'master'
pdf font subset: Generate valid font names

Closes #449

See merge request cairo/cairo!125
2021-02-21 15:49:06 +00:00
Tim-Philipp Müller
79b539fabb Merge branch 'ci-update-macos-image' into 'master'
ci: update macos tags for newer vm image

See merge request cairo/cairo!121
2021-02-20 15:28:05 +00:00
Tim-Philipp Müller
917a1eddb4 ci: update macos tags for newer vm image
cf. https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/389
2021-02-20 15:07:48 +00:00
Uli Schlachter
92fa421261 Merge branch 'small-build-system-fixes' into 'master'
Small build system fixes

See merge request cairo/cairo!111
2021-02-14 09:18:27 +00:00
Uli Schlachter
ac616c270d Fix a memory leak with cairo_tag_begin() + pdf
The error paths in _cairo_pdf_interchange_begin_dest_tag() do not clean
up and cause some memory to be leaked. Fix this by adding the necessary
free()s.

The first hunk, the missing free(dest) was found by oss-fuzz (see link
below).

The second hunk is an obvious follow up. It also cleans up the memory
allocated by _cairo_tag_parse_dest_attributes().

The cleanup in the second hunk is similar to the function
_named_dest_pluck() in the same function, but that function also removes
the entry from a hash table.  The error case here is that exactly this
hash table insertion failed.  Thus, the code cannot simply use the
already existing function.

Fixes: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=30880
Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-02-13 10:00:42 +01:00
Heiko Lewin
38a5c60368 cairo-quartz-image-surface.c: Fix types 2021-02-11 19:12:10 +00:00
Heiko Lewin
38e486b34d cairo-quartz-image-surface.c: Fix types 2021-02-11 19:12:10 +00:00
Uli Schlachter
a3b69a0215 pdf font subset: Generate valid font names
A hash value is encoded in base 26 with upper case letters for font
names.

Commit ed984146 replaced "numerator = abs (hash);" with "numerator =
hash;" in this code, because hash has type uint32_t and the compiler
warned about taking the absolute value of an unsigned value.  However,
abs() is actually defined to take an int argument. Thus, there was some
implicit cast.

Since numerator has type long, i.e. is signed, it is now actually
possible to get an overflow in the implicit cast and then have a
negative number. The following code is not prepared for this and
produces non-letters when encoding the hash.

This commit fixes that problem by not using ldiv() and instead using /
and % to directly compute the needed values. This gets rid of the need
to convert to type long. Since now everything works with uint32_t, there
is no more chance for negative numbers messing things up.

Fixes: https://gitlab.freedesktop.org/cairo/cairo/-/issues/449
Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-02-09 16:54:35 +01:00
Uli Schlachter
ee43299276 Make the test case for bug 448 pass
Someone apparently forgot to actually add the reference image. And also
forgot to add the test to meson. Sigh.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-02-06 16:40:48 +01:00
Uli Schlachter
3894a1ab33 Merge branch 'fix_path_precision' into 'master'
test/path-precision.c: Correct initialization, error margin for comparisons

See merge request cairo/cairo!120
2021-02-05 15:01:07 +00:00
Heiko Lewin
fb017cc73a test/path-precision.c: Correct initialization, error margin for comparisons 2021-02-04 01:39:15 +01:00
Heiko Lewin
b29d0f3d58 Merge branch 'fix-recording-to-png' into 'master'
recording-surface: Fix offset error

See merge request cairo/cairo!118
2021-02-03 23:52:56 +00:00
Matthias Clasen
d07fb41056 recording-surface: Fix offset error
When a recording surface with non-zero origin is
saved to a png file, it gets cut off. Fix this by
setting a device offset when acquiring the source
image.
2021-01-30 18:08:45 -05:00
Uli Schlachter
48194cf093 Merge branch 'fill-use-after-free' into 'master'
Avoid use after free in cairo_fill

See merge request cairo/cairo!116
2021-01-22 19:00:10 +00:00
Uli Schlachter
ee90ce5946 Merge branch 'set-source-surface-leak' into 'master'
Plug a memory leak in an error case

See merge request cairo/cairo!115
2021-01-22 18:36:33 +00:00
Matthias Clasen
b345be5afe Avoid a use-after-free
asan was complaining that the limits struct goes out
of scope before it is used via the pointer in the polygon struct,
and it is right:

==386746==ERROR: AddressSanitizer: stack-use-after-scope on address 0x7ffd3ccebdfc at pc 0x7f783d5eaaee bp 0x7ffd3cceba80 sp 0x7ffd3cceba70
READ of size 4 at 0x7ffd3ccebdfc thread T0
    #0 0x7f783d5eaaed in _add_clipped_edge ../src/cairo-polygon.c:351
    #1 0x7f783d5ebba3 in _cairo_polygon_add_edge ../src/cairo-polygon.c:520
    #2 0x7f783d5ebc82 in _cairo_polygon_add_external_edge ../src/cairo-polygon.c:530
    #3 0x7f783d582149 in _cairo_filler_line_to ../src/cairo-path-fill.c:63
    #4 0x7f783d588d9c in _cairo_path_fixed_interpret ../src/cairo-path-fixed.c:831
    #5 0x7f783d582a44 in _cairo_path_fixed_fill_to_polygon ../src/cairo-path-fill.c:147
    #6 0x7f783d6204fe in _cairo_spans_compositor_fill ../src/cairo-spans-compositor.c:1151
    #7 0x7f783d5126de in _cairo_compositor_fill ../src/cairo-compositor.c:203
    #8 0x7f783d5571f9 in _cairo_image_surface_fill ../src/cairo-image-surface.c:1003
    #9 0x7f783d647f2f in _cairo_surface_fill ../src/cairo-surface.c:2424
    #10 0x7f783d52ebea in _cairo_gstate_fill ../src/cairo-gstate.c:1312
    #11 0x7f783d51cca4 in _cairo_default_context_fill ../src/cairo-default-context.c:1057
    #12 0x7f783d6812d6 in cairo_fill ../src/cairo.c:2421
2021-01-22 13:28:44 -05:00
Matthias Clasen
36f5dee473 Plug a memory leak in an error case
GTK has a testcase that tests the error when creating
an oversize image, and asan tells me that it triggers
a memory leak in cairo:

Direct leak of 160 byte(s) in 1 object(s) allocated from:
    #0 0x7f1122755667 in __interceptor_malloc (/lib64/libasan.so.6+0xb0667)
    #1 0x7f1120cc83e8 in _cairo_pattern_create_solid ../src/cairo-pattern.c:607
    #2 0x7f1120cc8487 in _cairo_pattern_create_in_error ../src/cairo-pattern.c:630
    #3 0x7f1120cc87cb in INT_cairo_pattern_create_for_surface ../src/cairo-pattern.c:736
    #4 0x7f1120c1f1c7 in _cairo_default_context_set_source_surface ../src/cairo-default-context.c:327
    #5 0x7f1120d8386a in INT_cairo_set_source_surface ../src/cairo.c:982
    #6 0x7f1121d005a2 in gdk_cairo_set_source_pixbuf ../gdk/gdkcairo.c:234
    #7 0x401427 in test_set_source_big_pixbuf ../testsuite/gdk/cairo.c:23
2021-01-22 12:41:38 -05:00
Uli Schlachter
76aed3a5e3 Merge branch 'fix-autoconf' into 'master'
Fix autoconf warnings for version 2.70

See merge request cairo/cairo!113
2021-01-21 16:39:15 +00:00
Uli Schlachter
d909a7392c Merge branch 'use_correct_variable' into 'master'
Replace $have_png with $use_png

See merge request cairo/cairo!88
2021-01-19 16:34:49 +00:00
Heiko Lewin
f5d32c071f Merge branch 'fix_surface_ref' into 'master'
Add missing call to cairo_surface_reference

See merge request cairo/cairo!102
2021-01-19 12:11:33 +00:00
Heiko Lewin
ba2afdcacf cairo-quartz-image-surface.c: Add missing call to cairo_surface_reference (Thanks to Fred Bca) 2021-01-19 12:11:33 +00:00
Heiko Lewin
fa1b02d7e5 Merge branch 'fix_device_errors' into 'master'
Fix device errors

See merge request cairo/cairo!30
2021-01-19 11:26:33 +00:00
Heiko Lewin
99dc4bf4ce Fix device errors for GLESv2 contexts
Ignore GLerrors when re-selecting a (possibly deleted) GLprogram
2021-01-19 11:26:33 +00:00
Heiko Lewin
a88696ed15 Merge branch 'extend-test-pdf-tagged-text' into 'master'
Add tests for PDF metadata

See merge request cairo/cairo!100
2021-01-19 11:12:27 +00:00
Heiko Lewin
01f38097a5 cairo-xlib: Check for maximum surface size 2021-01-19 11:07:54 +00:00
Heiko Lewin
d49d855819 Merge branch 'win32-get-dc' into 'master'
cairo_win32_surface_get_dc: Return NULL for error surfaces

Closes #405

See merge request cairo/cairo!106
2021-01-19 11:06:44 +00:00
Heiko Lewin
941cddfa39 'Fix' a NULL pointer 'dereference' in cairo-pdf-surface 2021-01-19 10:48:52 +00:00
Heiko Lewin
f0873222ef Fix autoconf warnings for version 2.70 2021-01-18 17:55:04 +01:00
Uli Schlachter
4e2e876be1 'Fix' a NULL pointer 'dereference' in cairo-pdf-surface
The expression &image_surface->base basically just casts the
cairo_image_surface_t* to cairo_surface_t*. However, technically it is a
NULL pointer dereference and UndefinedBehaviorSanitizer flags it as
such:

runtime error: member access within null pointer of type 'cairo_image_surface_t' (aka 'struct _cairo_image_surface')

This commit fixes this by adding a NULL check.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-01-17 20:59:58 +01:00
Uli Schlachter
d72ff7c18a Merge branch 'autotools-dist-meson-subproject-wraps' into 'master'
autotools: dist meson subproject wraps

Closes #447

See merge request cairo/cairo!91
2021-01-17 10:57:48 +00:00
Uli Schlachter
0224c7802f Merge gitlab.freedesktop.org:pcpenpal/cairo 2021-01-17 08:24:00 +01:00
Uli Schlachter
4258fbd3b7 cairo 1.17.4 release
-----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCgA4FiEEpmEQCz2sHU8srYpU5gOyV4+48PsFAl/Cz0AaHGJyeWNlQGJy
 eWNlaGFycmluZ3Rvbi5vcmcACgkQ5gOyV4+48PtUXxAAnYipgwpcIKWoSt4eP1o/
 SPqeupY0AQUWB8y6xKoAhcBzt/HOQBqMxWo+zJSkIndJMRusezSmnt+qHY1bXGTX
 pqyipyYfSUJnT6BB/iZvwcAPlW2ISLuI85qdW126nKX9jxCx1uTejogGzeLC2nLK
 DucPZ1N7HU87GEc2mcl1aYkwTHp1f4jEQhRFExvCJg9YA3W+SgDQ2XEMEeewqljM
 /AT7tL3yWFCv4OU5ci7qhUZPp9ZgWZ1vc+0zS1MgpVo7XwxUWL+NaCbhbVJoH6Dq
 rwPE+RJOh1zkkatY/jZQYmW65gnqxed7lcUJ8XmRCUQiIQNvKzYApthj1EW4bxV4
 yxz+O6OiHlnnf20IwqAirEeHOUHYwINHVTE/UZovB1pu983iPQztNH9wfSmhDkhj
 MS+mNVyLJc4Jb/UQvLOkDVljuT2tmtOYytSeMb5z0D+EjBPDAnWZk9RV7UouK+nF
 HjuXEC45NEPzD5H4G8R4HZXBlSbV/SuzyS0Ljor8GBSdAJ9Xf6pDojgNCXLzHgny
 byD1j7jB5rqmGfy72IRUtLFqThroEiTaKXPNJ44P9lK/YdpBZfn99BmtLEUETNeM
 enm8ex1CWYrzLlq5UwM/2FYLE6Tiy5AQOqGfcnQpuaEG4qKao5Za7hmUy3yWitfa
 OK/2GwlDbHXfu/Ekg1kzzFk=
 =jna2
 -----END PGP SIGNATURE-----

Merge tag '1.17.4'

cairo 1.17.4 release

We are not quite sure what happened, but the 1.17.4 tag and the master
branch have different Git histories, but the same content. The merge
commits are missing from the history of the tag. This merge is simply
the result of "git merge 1.17.4".

This fixes: https://gitlab.freedesktop.org/cairo/cairo/-/issues/446
2021-01-16 16:17:46 +01:00
Uli Schlachter
f0fb05f3a1 Merge branch 'meson-only-build-helper-libs-if-needed' into 'master'
meson: only build cairo-boilerplate and cairo-missing helper libs if needed

See merge request cairo/cairo!110
2021-01-16 11:37:21 +00:00
Tim-Philipp Müller
51d50621be meson: only build cairo-boilerplate and cairo-missing helper libs if needed
Used by tests and the sphinx utility, which may or may not be built,
and if they're not built we don't need to build those libs either.
2021-01-15 18:47:08 +00:00
Uli Schlachter
81806c0111 cairo-xlib: Check for maximum surface size
X11 use uint16_t for the width/height of things. Anything too large will
be truncated when sending the request to the X11 server. This commit
adds a size check to a function that did not check things and then later
caused a segmentation fault.

Not adding a test case because the test case from the below bug report
allocates 3,5 GiB of memory, which I find too much for a test.

Fixes: https://gitlab.freedesktop.org/cairo/cairo/-/issues/414
Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-01-13 16:36:33 +01:00