Attachment 64677 Details for Bug 52488 – Guard against scaleImage returning NULL

[patch] Guard against scaleImage returning NULL

poppler.patch (text/plain), 1.02 KB, created by Octoploid on 2012-07-25 16:56:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Octoploid

Created: 2012-07-25 16:56:43 UTC

Size: 1.02 KB

patch

obsolete

>diff --git a/splash/Splash.cc b/splash/Splash.cc
>index b927e5e..1fffcf8 100644
>--- a/splash/Splash.cc
>+++ b/splash/Splash.cc
>@@ -3457,7 +3457,8 @@ SplashError Splash::drawImage(SplashImageSource src, void *srcData,
>       }
>       scaledImg = scaleImage(src, srcData, srcMode, nComps, srcAlpha, w, h,
> 			     scaledWidth, scaledHeight);
>-      blitImage(scaledImg, srcAlpha, x0, y0, clipRes);
>+      if (scaledImg)
>+        blitImage(scaledImg, srcAlpha, x0, y0, clipRes);
>       delete scaledImg;
>     }
> 
>@@ -3492,8 +3493,10 @@ SplashError Splash::drawImage(SplashImageSource src, void *srcData,
>       }
>       scaledImg = scaleImage(src, srcData, srcMode, nComps, srcAlpha, w, h,
> 			     scaledWidth, scaledHeight);
>-      vertFlipImage(scaledImg, scaledWidth, scaledHeight, nComps);
>-      blitImage(scaledImg, srcAlpha, x0, y0, clipRes);
>+      if (scaledImg) {
>+        vertFlipImage(scaledImg, scaledWidth, scaledHeight, nComps);
>+        blitImage(scaledImg, srcAlpha, x0, y0, clipRes);
>+      }
>       delete scaledImg;
>     }
>

Actions: View | Splinter Review

Attachments on bug 52488: 64677 | 65059 | 65477 | 66003 | 66005

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.