diff options
| author | Adrian Johnson <ajohnson@redneon.com> | 2016-10-20 21:12:30 +1030 |
|---|---|---|
| committer | Bryce Harrington <bryce@osg.samsung.com> | 2017-11-07 17:01:49 -0800 |
| commit | 38fbe621cf80d560cfc27b54b5417b62cda64c8a (patch) | |
| tree | c6fc5177933c3ebb368e7531eb187ba994ae97a4 /src/cairo-image-compositor.c | |
| parent | 35fccff6ec393ccca3d3ced79093ca491ce32df4 (diff) | |
| download | cairo-38fbe621cf80d560cfc27b54b5417b62cda64c8a.tar.gz | |
image: prevent invalid ptr access for > 4GB images
Image data is often accessed using:
image->data + y * image->stride
On 64-bit achitectures if the image data is > 4GB, this computation
will overflow since both y and stride are 32-bit types.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=98165
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Diffstat (limited to 'src/cairo-image-compositor.c')
| -rw-r--r-- | src/cairo-image-compositor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c index 2d25a31bb..9f4e0adad 100644 --- a/src/cairo-image-compositor.c +++ b/src/cairo-image-compositor.c @@ -1581,7 +1581,7 @@ typedef struct _cairo_image_span_renderer { pixman_image_t *src, *mask; union { struct fill { - int stride; + ptrdiff_t stride; uint8_t *data; uint32_t pixel; } fill; @@ -1600,7 +1600,7 @@ typedef struct _cairo_image_span_renderer { struct finish { cairo_rectangle_int_t extents; int src_x, src_y; - int stride; + ptrdiff_t stride; uint8_t *data; } mask; } u; |