diff options
author | Marco Pesenti Gritti <marco@gnome.org> | 2005-02-09 13:10:30 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2005-02-09 13:10:30 (GMT) |
commit | 649c674876d483dcc861c4baaaec33d19b24fffc (patch) | |
tree | 753d43984fd54355bf387f7e3c448cdd1b5f5407 /pdf | |
parent | c65f029b1669d2aae4417169d6b0c25969521d47 (diff) |
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
Diffstat (limited to 'pdf')
-rw-r--r-- | pdf/xpdf/Catalog.cc | 8 | ||||
-rw-r--r-- | pdf/xpdf/XRef.cc | 12 |
2 files changed, 10 insertions, 10 deletions
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; } diff --git a/pdf/xpdf/XRef.cc b/pdf/xpdf/XRef.cc index f5c4159..5be2017 100644 --- a/pdf/xpdf/XRef.cc +++ b/pdf/xpdf/XRef.cc @@ -110,7 +110,7 @@ ObjectStream::ObjectStream(XRef *xref, int objStrNumA) { goto err1; } - if (nObjects*sizeof(int)/sizeof(int) != nObjects) { + if (nObjects*(int)sizeof(int)/sizeof(int) != nObjects) { error(-1, "Invalid 'nObjects'"); goto err1; } @@ -393,7 +393,7 @@ GBool XRef::readXRefTable(Parser *parser, Guint *pos) { if (newSize < 0) { goto err1; } - if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { + if (newSize*(int)sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { error(-1, "Invalid 'obj' parameters'"); goto err1; } @@ -503,7 +503,7 @@ GBool XRef::readXRefStream(Stream *xrefStr, Guint *pos) { goto err1; } if (newSize > size) { - if (newSize * sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { + if (newSize * (int)sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { error(-1, "Invalid 'size' parameter."); return gFalse; } @@ -597,7 +597,7 @@ GBool XRef::readXRefStreamSection(Stream *xrefStr, int *w, int first, int n) { if (newSize < 0) { return gFalse; } - if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { + if (newSize*(int)sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { error(-1, "Invalid 'size' inside xref table."); return gFalse; } @@ -736,7 +736,7 @@ GBool XRef::constructXRef() { error(-1, "Bad object number"); return gFalse; } - if (newSize*sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { + if (newSize*(int)sizeof(XRefEntry)/sizeof(XRefEntry) != newSize) { error(-1, "Invalid 'obj' parameters."); return gFalse; } @@ -763,7 +763,7 @@ GBool XRef::constructXRef() { } else if (!strncmp(p, "endstream", 9)) { if (streamEndsLen == streamEndsSize) { streamEndsSize += 64; - if (streamEndsSize*sizeof(int)/sizeof(int) != streamEndsSize) { + if (streamEndsSize*(int)sizeof(int)/sizeof(int) != streamEndsSize) { error(-1, "Invalid 'endstream' parameter."); return gFalse; } |