From 649c674876d483dcc861c4baaaec33d19b24fffc Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@gnome.org>
Date: Wed, 09 Feb 2005 13:10:30 +0000
Subject: Release 0.1.4

2005-02-09  Marco Pesenti Gritti  <marco@gnome.org>

        * NEWS:
        * configure.ac:

        Release 0.1.4

        * pdf/xpdf/Catalog.cc:
        * pdf/xpdf/XRef.cc:

        Fix the fix for CAN-2004-0888
---
(limited to 'pdf/xpdf/Catalog.cc')

diff --git a/pdf/xpdf/Catalog.cc b/pdf/xpdf/Catalog.cc
index 8762cd4..787a496 100644
--- a/pdf/xpdf/Catalog.cc
+++ b/pdf/xpdf/Catalog.cc
@@ -66,8 +66,8 @@ Catalog::Catalog(XRef *xrefA) {
   obj.free();
   // The gcc doesnt optimize this away, so this check is ok,
   // even if it looks like a pagesSize != pagesSize check
-  if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize ||
-      pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) {
+  if (pagesSize*(int)sizeof(Page *)/sizeof(Page *) != pagesSize ||
+      pagesSize*(int)sizeof(Ref)/sizeof(Ref) != pagesSize) {
     error(-1, "Invalid 'pagesSize'");
     ok = gFalse;
     return;
@@ -200,8 +200,8 @@ int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) {
       }
       if (start >= pagesSize) {
 	pagesSize += 32;
-        if (pagesSize*sizeof(Page *)/sizeof(Page *) != pagesSize ||
-            pagesSize*sizeof(Ref)/sizeof(Ref) != pagesSize) {
+        if (pagesSize*(int)sizeof(Page *)/sizeof(Page *) != pagesSize ||
+            pagesSize*(int)sizeof(Ref)/sizeof(Ref) != pagesSize) {
           error(-1, "Invalid 'pagesSize' parameter.");
           goto err3;
         }
--
cgit v0.9.1