Attachment 135296 Details for Bug 100056 – don't overflow y*stride on 64-bit

[patch] don't overflow y*stride on 64-bit

0001-cairo-don-t-overflow-y-stride-when-accessing-image-d.patch (text/plain), 2.56 KB, created by Adrian Johnson on 2017-11-08 10:43:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Johnson

Created: 2017-11-08 10:43:35 UTC

Size: 2.56 KB

patch

obsolete

>From e53ba03787ddb2d67286c70942e32bbeab36e7e3 Mon Sep 17 00:00:00 2001
>From: Adrian Johnson <ajohnson@redneon.com>
>Date: Wed, 8 Nov 2017 21:07:45 +1030
>Subject: [PATCH] cairo: don't overflow y * stride when accessing image data
>
>---
> poppler/CairoOutputDev.cc | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
>index 43c604f0..cc8a161b 100644
>--- a/poppler/CairoOutputDev.cc
>+++ b/poppler/CairoOutputDev.cc
>@@ -1834,7 +1834,7 @@ void CairoOutputDev::setSoftMask(GfxState * state, double * bbox, GBool alpha,
>     /* convert to a luminocity map */
>     uint32_t *source_data = (uint32_t*)cairo_image_surface_get_data(source);
>     /* get stride in units of 32 bits */
>-    int stride = cairo_image_surface_get_stride(source)/4;
>+    ptrdiff_t stride = cairo_image_surface_get_stride(source)/4;
>     for (int y=0; y<height; y++) {
>       for (int x=0; x<width; x++) {
> 	int lum = alpha ? fill_opacity : luminocity(source_data[y*stride + x]);
>@@ -2127,7 +2127,7 @@ void CairoOutputDev::drawImageMaskRegular(GfxState *state, Object *ref, Stream *
>   Guchar *pix;
>   cairo_matrix_t matrix;
>   int invert_bit;
>-  int row_stride;
>+  ptrdiff_t row_stride;
>   cairo_filter_t filter;
> 
>   /* TODO: Do we want to cache these? */
>@@ -2234,7 +2234,7 @@ void CairoOutputDev::drawImageMaskPrescaled(GfxState *state, Object *ref, Stream
>   Guchar *pix;
>   cairo_matrix_t matrix;
>   int invert_bit;
>-  int row_stride;
>+  ptrdiff_t row_stride;
> 
>   /* cairo does a very poor job of scaling down images so we scale them ourselves */
> 
>@@ -2527,7 +2527,7 @@ void CairoOutputDev::drawMaskedImage(GfxState *state, Object *ref,
> 				     GBool maskInterpolate)
> {
>   ImageStream *maskImgStr, *imgStr;
>-  int row_stride;
>+  ptrdiff_t row_stride;
>   unsigned char *maskBuffer, *buffer;
>   unsigned char *maskDest;
>   unsigned int *dest;
>@@ -2685,7 +2685,7 @@ void CairoOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *s
> 					 GBool maskInterpolate)
> {
>   ImageStream *maskImgStr, *imgStr;
>-  int row_stride;
>+  ptrdiff_t row_stride;
>   unsigned char *maskBuffer, *buffer;
>   unsigned char *maskDest;
>   unsigned int *dest;
>@@ -3088,7 +3088,7 @@ public:
>     if (!needsCustomDownscaling || printing || scaledWidth >= width || scaledHeight >= height) {
>       // No downscaling. Create cairo image containing the source image data.
>       unsigned char *buffer;
>-      int stride;
>+      ptrdiff_t stride;
> 
>       image = cairo_image_surface_create (maskColors ?
>                                           CAIRO_FORMAT_ARGB32 :
>-- 
>2.11.0
>

Actions: View | Splinter Review

Attachments on bug 100056: 130054 | 135296

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.