[poppler] Branch 'poppler-0.12' - poppler/PageLabelInfo.cc

[Albert Astals Cid]

 poppler/PageLabelInfo.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 726c7b8c112460f1762de4fe0b986e979f362771
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun Oct 25 21:55:55 2009 +0100

    do not accept negative interval lengths in the page labels tree
    
    See bug 24721

diff --git a/poppler/PageLabelInfo.cc b/poppler/PageLabelInfo.cc
index 8856881..84cb50f 100644
--- a/poppler/PageLabelInfo.cc
+++ b/poppler/PageLabelInfo.cc
@@ -3,7 +3,7 @@
 // This file is under the GPLv2 or later license
 //
 // Copyright (C) 2005-2006 Kristian Høgsberg <krh at redhat.com>
-// Copyright (C) 2005 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005, 2009 Albert Astals Cid <aacid at kde.org>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -205,6 +205,7 @@ PageLabelInfo::PageLabelInfo(Object *tree, int numPages) {
     } else {
       interval->length = numPages - interval->base;
     }
+    if (interval->length < 0) interval->length = 0;
   }
 }