[poppler] Branch 'xpdf303merge' - poppler/GfxState.cc

[Albert Astals Cid]

 poppler/GfxState.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 72c2d563684ab6937a98a0c1c79be3639d29c9ce
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Oct 4 17:46:11 2011 +0200

    xpdf303: Make sure array length is > 0
    
    This is not scritcly necessary since Array::get already returns a null object in case
    the index is out of range but let's merge it for the sake of being more closer to xpdf

diff --git a/poppler/GfxState.cc b/poppler/GfxState.cc
index c59a6b3..67c54b5 100644
--- a/poppler/GfxState.cc
+++ b/poppler/GfxState.cc
@@ -240,7 +240,7 @@ GfxColorSpace *GfxColorSpace::parse(Object *csObj, Gfx *gfx, int recursion) {
     } else {
       error(errSyntaxWarning, -1, "Bad color space '{0:s}'", csObj->getName());
     }
-  } else if (csObj->isArray()) {
+  } else if (csObj->isArray() && csObj->arrayGetLength() > 0) {
     csObj->arrayGet(0, &obj1);
     if (obj1.isName("DeviceGray") || obj1.isName("G")) {
       cs = new GfxDeviceGrayColorSpace();