poppler/Gfx.cc | 3 ++-
poppler/XRef.cc | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit e68410e359da932c7f30d8f0a41a5496268b339c
Author: Albert Astals Cid <aa...@kde.org>
Date: Sat Jan 9 17:34:55 2021 +0100
Gfx::opSetFillGray: Make sure the colorspace is gray
Otherwise we will end up doing an uninitialized memory read down the
road
oss-fuzz/10040
diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
index 20d450ed..694538cf 100644
--- a/poppler/Gfx.cc
+++ b/poppler/Gfx.cc
@@ -1310,7 +1310,8 @@ void Gfx::opSetFillGray(Object args[], int numArgs)
if (!obj.isNull()) {
colorSpace = GfxColorSpace::parse(res, &obj, out, state);
}
- if (colorSpace == nullptr) {
+ if (colorSpace == nullptr || colorSpace->getNComps() != 1) {
+ delete colorSpace;
colorSpace = state->copyDefaultGrayColorSpace();
}
state->setFillColorSpace(colorSpace);
commit 9dcf1e396a240df50bcc05339855732d1535260b
Author: Albert Astals Cid <aa...@kde.org>
Date: Sat Jan 9 17:34:29 2021 +0100
Update (C)
diff --git a/poppler/XRef.cc b/poppler/XRef.cc
index 0c0c3b5f..79cf25fc 100644
--- a/poppler/XRef.cc
+++ b/poppler/XRef.cc
@@ -15,7 +15,7 @@
//
// Copyright (C) 2005 Dan Sheridan <dan.sheri...@postman.org.uk>
// Copyright (C) 2005 Brad Hards <br...@frogmouth.net>
-// Copyright (C) 2006, 2008, 2010, 2012-2014, 2016-2020 Albert Astals Cid
<aa...@kde.org>
+// Copyright (C) 2006, 2008, 2010, 2012-2014, 2016-2021 Albert Astals Cid
<aa...@kde.org>
// Copyright (C) 2007-2008 Julien Rebetez <juli...@svn.gnome.org>
// Copyright (C) 2007 Carlos Garcia Campos <carlo...@gnome.org>
// Copyright (C) 2009, 2010 Ilya Gorenbein <igorenb...@finjan.com>
_______________________________________________
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
