summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2013-01-10 19:07:48 +0100
committerAlbert Astals Cid <aacid@kde.org>2013-01-10 19:07:48 +0100
commitbbc2d8918fe234b7ef2c480eb148943922cc0959 (patch)
treea0b994222a786236f3353bc4c7bfc4a441a7b0df
parenta9b8ab4657dec65b8b86c225d12c533ad7e984e2 (diff)
Fix invalid memory accesses in 1036.pdf.asan.23.17
-rw-r--r--splash/Splash.cc14
1 files changed, 12 insertions, 2 deletions
diff --git a/splash/Splash.cc b/splash/Splash.cc
index 24d934ab..1f838afb 100644
--- a/splash/Splash.cc
+++ b/splash/Splash.cc
@@ -16,3 +16,3 @@
// Copyright (C) 2010-2012 Thomas Freitag <Thomas.Freitag@alfa.de>
-// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
+// Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
// Copyright (C) 2011, 2012 William Bader <williambader@hotmail.com>
@@ -3310,2 +3310,8 @@ void Splash::scaleMaskYuXd(SplashImageMaskSource src, void *srcData,
int i;
+
+ destPtr0 = dest->data;
+ if (destPtr0 == NULL) {
+ error(errInternal, -1, "dest->data is NULL in Splash::scaleMaskYuXd");
+ return;
+ }
@@ -3325,3 +3331,2 @@ void Splash::scaleMaskYuXd(SplashImageMaskSource src, void *srcData,
- destPtr0 = dest->data;
for (y = 0; y < srcHeight; ++y) {
@@ -4864,2 +4869,7 @@ void Splash::vertFlipImage(SplashBitmap *img, int width, int height,
int w;
+
+ if (unlikely(img->data == NULL)) {
+ error(errInternal, -1, "img->data is NULL in Splash::vertFlipImage");
+ return;
+ }