[poppler] Branch 'poppler-0.10' - poppler/Gfx.cc

[Albert Astals Cid]

 poppler/Gfx.cc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 043ea623497cb6dd0a824e8f91b1a2bd4797fa48
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Mar 11 00:25:07 2009 +0100

    Check there is an optional content config before using it
    
    Fixes bug #20587

diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
index 20ec1bf..9b67ed9 100644
--- a/poppler/Gfx.cc
+++ b/poppler/Gfx.cc
@@ -14,7 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2005 Jonathan Blandford <jrb at redhat.com>
-// Copyright (C) 2005-2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005-2009 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2006 Thorkild Stray <thorkild at ifi.uio.no>
 // Copyright (C) 2006 Kristian Høgsberg <krh at redhat.com>
 // Copyright (C) 2006-2008 Carlos Garcia Campos <carlosgc at gnome.org>
@@ -3503,7 +3503,7 @@ void Gfx::opXObject(Object args[], int numArgs) {
   if (obj2.isNull()) {
     // No OC entry - so we proceed as normal
   } else if (obj2.isRef()) {
-    if ( ! catalog->getOptContentConfig()->optContentIsVisible( &obj2 ) ) {
+    if ( catalog->getOptContentConfig() && ! catalog->getOptContentConfig()->optContentIsVisible( &obj2 ) ) {
       obj2.free();
       obj1.free();
       return;