Attachment 121704 Details for Bug 94053 – Remove limit check and use checkoverflow instead

[patch] Remove limit check and use checkoverflow instead

94053.patch (text/plain), 1.20 KB, created by Thomas Freitag on 2016-02-12 09:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Freitag

Created: 2016-02-12 09:30:01 UTC

Size: 1.20 KB

patch

obsolete

>diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
>index d2827d1..9560858 100644
>--- a/poppler/SplashOutputDev.cc
>+++ b/poppler/SplashOutputDev.cc
>@@ -4481,10 +4481,6 @@ GBool SplashOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *ca
>     repeatX = x1 - x0;
>     repeatY = y1 - y0;
>   } else {
>-    if ((unsigned long) result_width * result_height > 0x800000L) {
>-      state->setCTM(savedCTM[0], savedCTM[1], savedCTM[2], savedCTM[3], savedCTM[4], savedCTM[5]);
>-      return gFalse;
>-    }
>     while(fabs(kx) > 16384 || fabs(ky) > 16384) {
>       // limit pattern bitmap size
>       m1.m[0] /= 2;
>@@ -4525,6 +4521,13 @@ GBool SplashOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *ca
> 
>   bitmap = new SplashBitmap(surface_width, surface_height, 1,
>                             (paintType == 1) ? colorMode : splashModeMono8, gTrue);
>+  if (bitmap->getDataPtr() == NULL) { 
>+    SplashBitmap *tBitmap = bitmap;
>+    bitmap = formerBitmap;
>+    delete tBitmap; 
>+    state->setCTM(savedCTM[0], savedCTM[1], savedCTM[2], savedCTM[3], savedCTM[4], savedCTM[5]);
>+    return gFalse;
>+  }
>   splash = new Splash(bitmap, gTrue);
>   if (paintType == 2) {
>     SplashColor clearColor;

Actions: View | Splinter Review

Attachments on bug 94053: 121674 | 121704 | 121707

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.