Hello community, here is the log from the commit of package libreoffice-libs-extern for openSUSE:Factory checked in at Mon Feb 21 15:20:03 CET 2011.
-------- --- libreoffice-libs-extern/libreoffice-libs-extern.changes 2011-01-11 17:38:16.000000000 +0100 +++ libreoffice-libs-extern/libreoffice-libs-extern.changes 2011-02-16 16:48:24.000000000 +0100 @@ -1,0 +2,29 @@ +Wed Feb 16 16:27:04 CET 2011 - [email protected] + +- updated to libreoffice-3.3.1.2 (3.3.1-rc2) + +------------------------------------------------------------------- +Tue Feb 8 20:53:59 CET 2011 - [email protected] + +- updated to libreoffice-3.3.1.1 (3.3.1-rc1) + +------------------------------------------------------------------- +Fri Feb 4 19:32:37 CET 2011 - [email protected] + +- updated libwpd to version 0.9.1: + * parse correctly WP 2 for Mac documents without resource fork + * improvements in parsing of pictures in WP1 parser + * fix wrong sizes of some functions in WP1 and WP42 parsers + * fix handling of character attributes + +------------------------------------------------------------------- +Mon Jan 31 20:32:38 CET 2011 - [email protected] + +- libreoffice-build-3.3.0.4 == 3.3.0-rc4 == final + +------------------------------------------------------------------- +Wed Jan 19 12:58:21 CET 2011 - [email protected] + +- updated to libreoffice-3.3.0.4 (3.3-rc4) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 86e390f015e505dd71a66f0123c62f09-libwpd-0.9.0.tar.bz2 libreoffice-libs-extern-3.3.0.3.tar.bz2 libreoffice-libs-extern-sys-3.3.0.3.tar.bz2 New: ---- 5ff846847dab351604ad859e2fd4ed3c-libwpd-0.9.1.tar.bz2 libreoffice-libs-extern-3.3.1.2.tar.bz2 libreoffice-libs-extern-sys-3.3.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-libs-extern.spec ++++++ --- /var/tmp/diff_new_pack.5sLoaU/_old 2011-02-21 15:18:12.000000000 +0100 +++ /var/tmp/diff_new_pack.5sLoaU/_new 2011-02-21 15:18:12.000000000 +0100 @@ -21,11 +21,11 @@ Name: libreoffice-libs-extern # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %define use_xulrunner191 no -Version: 3.3.0.3 +Version: 3.3.1.2 Release: 1 %define piece libs-extern -%define ooo_build_version 3.3.0.3 -%define ooo_piece_version 3.3.0.3 +%define ooo_build_version 3.3.1.2 +%define ooo_piece_version 3.3.1.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice @@ -138,7 +138,7 @@ Source1029: 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz Source1030: 5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2 Source1031: 9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2 -Source1032: 86e390f015e505dd71a66f0123c62f09-libwpd-0.9.0.tar.bz2 +Source1032: 5ff846847dab351604ad859e2fd4ed3c-libwpd-0.9.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ++++++ 86e390f015e505dd71a66f0123c62f09-libwpd-0.9.0.tar.bz2 -> 5ff846847dab351604ad859e2fd4ed3c-libwpd-0.9.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpd-0.9.0/ChangeLog new/libwpd-0.9.1/ChangeLog --- old/libwpd-0.9.0/ChangeLog 2010-11-16 12:13:30.000000000 +0100 +++ new/libwpd-0.9.1/ChangeLog 2011-01-23 22:23:21.000000000 +0100 @@ -1,3 +1,54 @@ +2011-01-23 Fridrich Štrba <[email protected]> [cbff7a10b5b6640d39b1df66cf4a29e82a56e07e] + + Adopt NEWS for 0.9.1 release + + +2011-01-23 Fridrich Štrba <[email protected]> [13084077ae0137b1b491f369676e692cb27b4f8e] + + Fine-tune the extraction of Pict images in WP1 parser + + +2011-01-22 Fridrich Štrba <[email protected]> [4b9179cf7d6ad045b96c720fa5cdb3fdfe11b490] + + Fix attribute handling in all parsers + + +2011-01-22 Fridrich Štrba <[email protected]> [ea19e4f852d54732a667c3ec5c435ef4664a1564] + + Fix attribute handling in WP3 parser + + Attribute Off should reset the corresponding attribute, and not to flip it + +2011-01-04 Fridrich Štrba <[email protected]> [224fdf1f7fee621909b4a4e6488b872770fca3b4] + + Some more work on reverse-engineering the WP1 pictures + + +2011-01-03 Fridrich Štrba <[email protected]> [b03535ac9db274448fdf9c4a9c1b422df9f82501] + + Some more WP1 images support \Trying to reverse engineer from files that contain some of those pictures + + +2011-01-03 Fridrich Štrba <[email protected]> [80b80792fc431d8093de75bf1387705ba4deefe3] + + 0xCA looks like having size 4 + + +2011-01-03 Fridrich Štrba <[email protected]> [21e24df552a7ad0a4b37e1a70c2d3650efb1a9e2] + + 0xE1 looks like having variable length + + +2010-12-26 Fridrich Štrba <[email protected]> [7d080e31f077b3232ae1d71176c864af65f3f618] + + Fix parsing of WP2 documents without resource fork + + +2010-11-16 Fridrich Štrba <[email protected]> [066460fdee01e427f3b5639e649eefa4976629b5] + + Bump version after release + + 2010-11-10 Fridrich Štrba <[email protected]> [504aba6dda43fd231525c82473c06a8886eb88bb] Don't install the doc files with make install. Packagers do it in their spec/dsc files. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpd-0.9.0/NEWS new/libwpd-0.9.1/NEWS --- old/libwpd-0.9.0/NEWS 2010-11-10 15:47:02.000000000 +0100 +++ new/libwpd-0.9.1/NEWS 2011-01-23 22:20:28.000000000 +0100 @@ -1,4 +1,10 @@ CHANGES: +0.9.0 - 0.9.1 +- Parse correctly WP 2 for Mac documents without resource fork (Fridrich) +- Improvements in parsing of pictures in WP1 parser (Fridrich) +- Fix wrong sizes of some functions in WP1 and WP42 parsers (Fridrich) +- Fix handling of character attributes (Fridrich) + 0.8.x - 0.9.0 - Conversion of page-numbering (William) - Conversion of embedded images and text boxes in WP1, WP3, WP5 and WP6 documents diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpd-0.9.0/configure new/libwpd-0.9.1/configure --- old/libwpd-0.9.0/configure 2010-11-16 12:12:30.000000000 +0100 +++ new/libwpd-0.9.1/configure 2011-01-23 22:13:13.000000000 +0100 @@ -2389,7 +2389,7 @@ WPD_MAJOR_VERSION=0 WPD_MINOR_VERSION=9 -WPD_MICRO_VERSION=0 +WPD_MICRO_VERSION=1 WPD_VERSION="$WPD_MAJOR_VERSION.$WPD_MINOR_VERSION.$WPD_MICRO_VERSION" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpd-0.9.0/configure.in new/libwpd-0.9.1/configure.in --- old/libwpd-0.9.0/configure.in 2010-11-16 12:11:55.000000000 +0100 +++ new/libwpd-0.9.1/configure.in 2010-12-26 17:41:20.000000000 +0100 @@ -5,7 +5,7 @@ WPD_MAJOR_VERSION=0 WPD_MINOR_VERSION=9 -WPD_MICRO_VERSION=0 +WPD_MICRO_VERSION=1 WPD_VERSION="$WPD_MAJOR_VERSION.$WPD_MINOR_VERSION.$WPD_MICRO_VERSION" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpd-0.9.0/libwpd.spec new/libwpd-0.9.1/libwpd.spec --- old/libwpd-0.9.0/libwpd.spec 2010-11-16 12:13:03.000000000 +0100 +++ new/libwpd-0.9.1/libwpd.spec 2011-01-23 22:13:28.000000000 +0100 @@ -1,5 +1,5 @@ %define name libwpd -%define version 0.9.0 +%define version 0.9.1 %define RELEASE 1 %define release %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpd-0.9.0/src/lib/WP1ContentListener.cpp new/libwpd-0.9.1/src/lib/WP1ContentListener.cpp --- old/libwpd-0.9.0/src/lib/WP1ContentListener.cpp 2010-11-02 10:53:48.000000000 +0100 +++ new/libwpd-0.9.1/src/lib/WP1ContentListener.cpp 2011-01-23 21:49:13.000000000 +0100 @@ -208,7 +208,7 @@ if (isOn) m_ps->m_textAttributeBits |= textAttributeBit; else - m_ps->m_textAttributeBits ^= textAttributeBit; + m_ps->m_textAttributeBits &= ~textAttributeBit; } void WP1ContentListener::fontPointSize(uint8_t pointSize) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpd-0.9.0/src/lib/WP1FileStructure.cpp new/libwpd-0.9.1/src/lib/WP1FileStructure.cpp --- old/libwpd-0.9.0/src/lib/WP1FileStructure.cpp 2010-08-26 13:35:21.000000000 +0200 +++ new/libwpd-0.9.1/src/lib/WP1FileStructure.cpp 2011-01-03 12:27:14.000000000 +0100 @@ -40,7 +40,7 @@ 6, 8, -1, - 3, + 4, 6, 6, 3, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpd-0.9.0/src/lib/WP1PictureGroup.cpp new/libwpd-0.9.1/src/lib/WP1PictureGroup.cpp --- old/libwpd-0.9.0/src/lib/WP1PictureGroup.cpp 2010-08-26 13:35:21.000000000 +0200 +++ new/libwpd-0.9.1/src/lib/WP1PictureGroup.cpp 2011-01-23 22:18:14.000000000 +0100 @@ -25,7 +25,9 @@ #include "WP1PictureGroup.h" #include "libwpd_internal.h" +#ifndef DUMP_PICTURE #define DUMP_PICTURE 0 +#endif #if DUMP_PICTURE static unsigned pictureId = 0; @@ -48,17 +50,21 @@ void WP1PictureGroup::_readContents(WPXInputStream *input, WPXEncryption *encryption) { m_binaryData.clear(); - input->seek(1, WPX_SEEK_CUR); + uint8_t tmpWhatNot = readU8(input, encryption); + if (tmpWhatNot) + input->seek(1, WPX_SEEK_CUR); m_width = readU16(input, encryption, true); m_height = readU16(input, encryption, true); input->seek(6, WPX_SEEK_CUR); uint32_t dataSize = readU16(input, encryption, true); - if (dataSize + 11 > getSize()) + WPD_DEBUG_MSG(("WP1PictureGroup: Offset = 0x%.4x, Width = %i, Height = %i, Data Size = 0x%.4x\n", (unsigned)input->tell(), m_width, m_height, dataSize)); + if (dataSize + 13 > getSize()) return; - input->seek(-2, WPX_SEEK_CUR); for (int i = 0; i < 512; i++) m_binaryData.append((unsigned char)0); - for (unsigned long j = 0; j < dataSize && !input->atEOS(); j++ ); + m_binaryData.append(((dataSize + 512) & 0xFF00)>>8); + m_binaryData.append(((dataSize + 512) & 0x00FF)); + for (unsigned long j = 2; j < dataSize && !input->atEOS(); j++ ) m_binaryData.append(readU8(input, encryption)); #if DUMP_PICTURE std::ostringstream filename; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpd-0.9.0/src/lib/WP3ContentListener.cpp new/libwpd-0.9.1/src/lib/WP3ContentListener.cpp --- old/libwpd-0.9.0/src/lib/WP3ContentListener.cpp 2010-11-09 09:36:12.000000000 +0100 +++ new/libwpd-0.9.1/src/lib/WP3ContentListener.cpp 2011-01-23 21:49:13.000000000 +0100 @@ -379,7 +379,8 @@ if (isOn) m_ps->m_textAttributeBits |= textAttributeBit; else - m_ps->m_textAttributeBits ^= textAttributeBit; + // reset the corresponding bit to 0 and leave the others intact + m_ps->m_textAttributeBits &= ~textAttributeBit; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpd-0.9.0/src/lib/WP3Parser.cpp new/libwpd-0.9.1/src/lib/WP3Parser.cpp --- old/libwpd-0.9.0/src/lib/WP3Parser.cpp 2010-08-26 13:35:21.000000000 +0200 +++ new/libwpd-0.9.1/src/lib/WP3Parser.cpp 2010-12-26 18:47:08.000000000 +0100 @@ -44,6 +44,14 @@ WP3ResourceFork * WP3Parser::getResourceFork(WPXInputStream *input, WPXEncryption *encryption) { WP3ResourceFork *resourceFork = 0; + + // Certain WP2 documents actually don't contain resource fork, so check for its existence + if (!getHeader() || getHeader()->getDocumentOffset() <= 0x10) + { + WPD_DEBUG_MSG(("WP3Parser: Document does not contain resource fork\n")); + return 0; + } + try { resourceFork = new WP3ResourceFork(input, encryption); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpd-0.9.0/src/lib/WP42ContentListener.cpp new/libwpd-0.9.1/src/lib/WP42ContentListener.cpp --- old/libwpd-0.9.0/src/lib/WP42ContentListener.cpp 2010-11-02 10:53:48.000000000 +0100 +++ new/libwpd-0.9.1/src/lib/WP42ContentListener.cpp 2011-01-23 21:49:13.000000000 +0100 @@ -139,7 +139,7 @@ if (isOn) m_ps->m_textAttributeBits |= textAttributeBit; else - m_ps->m_textAttributeBits ^= textAttributeBit; + m_ps->m_textAttributeBits &= ~textAttributeBit; } void WP42ContentListener::marginReset(uint8_t /* leftMargin */, uint8_t /* rightMargin */) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpd-0.9.0/src/lib/WP42FileStructure.cpp new/libwpd-0.9.1/src/lib/WP42FileStructure.cpp --- old/libwpd-0.9.0/src/lib/WP42FileStructure.cpp 2010-08-26 13:35:21.000000000 +0200 +++ new/libwpd-0.9.1/src/lib/WP42FileStructure.cpp 2011-01-03 11:53:11.000000000 +0100 @@ -63,7 +63,7 @@ 4, -1, 4, // 0XE0 - 3, + -1, -1, 150, 6, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpd-0.9.0/src/lib/WP5ContentListener.cpp new/libwpd-0.9.1/src/lib/WP5ContentListener.cpp --- old/libwpd-0.9.0/src/lib/WP5ContentListener.cpp 2010-11-02 10:53:48.000000000 +0100 +++ new/libwpd-0.9.1/src/lib/WP5ContentListener.cpp 2011-01-23 21:49:13.000000000 +0100 @@ -433,7 +433,7 @@ if (isOn) m_ps->m_textAttributeBits |= textAttributeBit; else - m_ps->m_textAttributeBits ^= textAttributeBit; + m_ps->m_textAttributeBits &= ~textAttributeBit; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpd-0.9.0/src/lib/WP6ContentListener.cpp new/libwpd-0.9.1/src/lib/WP6ContentListener.cpp --- old/libwpd-0.9.0/src/lib/WP6ContentListener.cpp 2010-11-02 10:53:48.000000000 +0100 +++ new/libwpd-0.9.1/src/lib/WP6ContentListener.cpp 2011-01-23 21:49:13.000000000 +0100 @@ -790,7 +790,7 @@ if (isOn) m_ps->m_textAttributeBits |= textAttributeBit; else - m_ps->m_textAttributeBits ^= textAttributeBit; + m_ps->m_textAttributeBits &= ~textAttributeBit; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpd-0.9.0/src/lib/WPXHeader.cpp new/libwpd-0.9.1/src/lib/WPXHeader.cpp --- old/libwpd-0.9.0/src/lib/WPXHeader.cpp 2010-08-26 13:35:21.000000000 +0200 +++ new/libwpd-0.9.1/src/lib/WPXHeader.cpp 2010-12-26 18:50:46.000000000 +0100 @@ -79,6 +79,7 @@ input->seek(WPX_HEADER_ENCRYPTION_OFFSET, WPX_SEEK_SET); uint16_t documentEncryption = readU16(input, encryption); + WPD_DEBUG_MSG(("WordPerfect: Document Offset = 0x%x \n",documentOffset)); WPD_DEBUG_MSG(("WordPerfect: Product Type: %i File Type: %i Major Version: %i Minor Version: %i\n", productType, fileType, majorVersion, minorVersion)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpd-0.9.0/src/lib/libwpd-stream.h new/libwpd-0.9.1/src/lib/libwpd-stream.h --- old/libwpd-0.9.0/src/lib/libwpd-stream.h 2010-11-16 12:13:03.000000000 +0100 +++ new/libwpd-0.9.1/src/lib/libwpd-stream.h 2011-01-23 22:13:27.000000000 +0100 @@ -27,8 +27,8 @@ #define LIBWPD_STREAM_VERSION_MAJOR 0 #define LIBWPD_STREAM_VERSION_MINOR 9 -#define LIBWPD_STREAM_VERSION_REVISION 0 -#define LIBWPD_STREAM_VERSION_STRING "0.9.0" +#define LIBWPD_STREAM_VERSION_REVISION 1 +#define LIBWPD_STREAM_VERSION_STRING "0.9.1" #include "WPXStream.h" #include "WPXStreamImplementation.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwpd-0.9.0/src/lib/libwpd.h new/libwpd-0.9.1/src/lib/libwpd.h --- old/libwpd-0.9.0/src/lib/libwpd.h 2010-11-16 12:13:03.000000000 +0100 +++ new/libwpd-0.9.1/src/lib/libwpd.h 2011-01-23 22:13:27.000000000 +0100 @@ -28,8 +28,8 @@ #define LIBWPD_VERSION_MAJOR 0 #define LIBWPD_VERSION_MINOR 9 -#define LIBWPD_VERSION_REVISION 0 -#define LIBWPD_VERSION_STRING "0.9.0" +#define LIBWPD_VERSION_REVISION 1 +#define LIBWPD_VERSION_STRING "0.9.1" #include "WPXDocumentInterface.h" #include "WPDocument.h" ++++++ libreoffice-libs-extern-3.3.0.3.tar.bz2 -> libreoffice-libs-extern-3.3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-libs-extern-3.3.0.3/ChangeLog new/libreoffice-libs-extern-3.3.1.2/ChangeLog --- old/libreoffice-libs-extern-3.3.0.3/ChangeLog 2011-01-10 20:00:19.000000000 +0100 +++ new/libreoffice-libs-extern-3.3.1.2/ChangeLog 2011-02-15 20:14:40.000000000 +0100 @@ -1,3 +1,51 @@ +2011-02-15 Petr Mladek <[email protected]> [02f6c554a23294bc1401edbb0c974164a4376c72] + +Version 3.3.1.2, tag libreoffice-3.3.1.2 (3.3.1-rc2) + + +2011-02-08 Petr Mladek <[email protected]> [50c9598ba64212a30b93ff818b01e6edb2d79ece] + +Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) + + +2011-02-07 Jan Holesovsky <[email protected]> [48d68cb55dece21703b2fd24822905ebf024a7c8] + +Branch libreoffice-3-3-1 + +This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. +Only very safe changes, reviewed by three people are allowed. + +If you want to commit more complicated fix for the next 3.3.x release, +please use the 'libreoffice-3-3' branch. + +If you want to build something cool, unstable, and risky, use master. + +2011-01-24 Fridrich Štrba <[email protected]> [42a8568ffba726cd03054933b6af60288cab8bdd] + +upgrade libwpd to 0.9.1 + + +2011-01-11 Petr Mladek <[email protected]> [89d2254ecf768981e1dd5562b895aee756125478] + +Please, ignore the previous message; it was for the libreoffice-3-3-0 branch + +This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. +Only safe changes, reviewed by anoter person are allowed. + +If you want to build something cool, unstable, and risky, use master. + +2011-01-11 Petr Mladek <[email protected]> [156a4b779e5510f4aacdfec906f171175a23b492] + +Branch libreoffice-3-3-0 + +This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. +Only very safe changes, reviewed by three people are allowed. + +If you want to commit more complicated fix for the next 3.3.x release, +please use the 'libreoffice-3-3' branch. + +If you want to build something cool, unstable, and risky, use master. + 2011-01-10 Petr Mladek <[email protected]> [015e1f58769cb136153329c4755bc23375ea1b51] Version 3.3.0.3, tag libreoffice-3.3.0.3 (3.3-rc3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-libs-extern-3.3.0.3/libwpd/libwpd-0.8.8.diff new/libreoffice-libs-extern-3.3.1.2/libwpd/libwpd-0.8.8.diff --- old/libreoffice-libs-extern-3.3.0.3/libwpd/libwpd-0.8.8.diff 2010-11-11 16:35:21.000000000 +0100 +++ new/libreoffice-libs-extern-3.3.1.2/libwpd/libwpd-0.8.8.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,908 +0,0 @@ -*** misc/libwpd-0.8.8/configure Tue Jan 9 10:35:10 2007 ---- misc/build/libwpd-0.8.8/configure Thu Feb 21 11:37:54 2008 -*************** -*** 8089,8095 **** - ;; - - freebsd*) -! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) ---- 8089,8095 ---- - ;; - - freebsd*) -! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -*************** -*** 11808,11814 **** - ;; - - freebsd*) -! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) ---- 11808,11814 ---- - ;; - - freebsd*) -! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -*************** -*** 14978,14984 **** - ;; - - freebsd*) -! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) ---- 14978,14984 ---- - ;; - - freebsd*) -! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -*************** -*** 17346,17352 **** - ;; - - freebsd*) -! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) ---- 17346,17352 ---- - ;; - - freebsd*) -! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) -*** misc/libwpd-0.8.8/src/lib/WP1Heuristics.cpp Wed Jan 3 13:07:55 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP1Heuristics.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 27,32 **** ---- 27,33 ---- - #include "WP1Heuristics.h" - #include "WP1FileStructure.h" - #include "libwpd_internal.h" -+ #include <limits> - - WPDConfidence WP1Heuristics::isWP1FileFormat(WPXInputStream *input, bool partialContent) - { -*************** -*** 74,81 **** - // <function code>{function length}...{function length}<function code> - // that we observed in variable length WP1 functions - -! long functionLength = readU32(input, true); -! long closingFunctionLength = 0; - WPD_DEBUG_MSG(("WP1Heuristics functionLength = 0x%.8x\n", (unsigned int)functionLength)); - - input->seek(functionLength, WPX_SEEK_CUR); ---- 75,84 ---- - // <function code>{function length}...{function length}<function code> - // that we observed in variable length WP1 functions - -! unsigned long functionLength = readU32(input, true); -! if (functionLength > ((std::numeric_limits<uint32_t>::max)() / 2)) -! return WPD_CONFIDENCE_NONE; -! unsigned long closingFunctionLength = 0; - WPD_DEBUG_MSG(("WP1Heuristics functionLength = 0x%.8x\n", (unsigned int)functionLength)); - - input->seek(functionLength, WPX_SEEK_CUR); -*** misc/libwpd-0.8.8/src/lib/WP1Part.cpp Wed Jan 3 13:07:55 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP1Part.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 46,51 **** ---- 46,58 ---- - } - else if (WP1_FUNCTION_GROUP_SIZE[readVal-0xC0] == -1) - { -+ // Should not happen because the heuristics would not recognize this file as a well formed WP1 file, -+ // Nonetheless if we ever change the parts using the heuristics, this will be a check useful to have -+ if (!WP1VariableLengthGroup::isGroupConsistent(input, readVal)) -+ { -+ WPD_DEBUG_MSG(("WordPerfect: Consistency Check (variable length) failed; ignoring this byte\n")); -+ return 0; -+ } - WPD_DEBUG_MSG(("WordPerfect: constructVariableLengthGroup\n")); - return WP1VariableLengthGroup::constructVariableLengthGroup(input, readVal); - } -*** misc/libwpd-0.8.8/src/lib/WP1SetTabsGroup.cpp Fri Jan 5 10:21:16 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP1SetTabsGroup.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 39,45 **** - void WP1SetTabsGroup::_readContents(WPXInputStream *input) - { - // Skip first the old condensed tab table -! while (readU8(input) != 0xff) - input->seek(2, WPX_SEEK_CUR); - - // Now read the new condensed tab table ---- 39,45 ---- - void WP1SetTabsGroup::_readContents(WPXInputStream *input) - { - // Skip first the old condensed tab table -! while (readU8(input) != 0xff && !input->atEOS()) - input->seek(2, WPX_SEEK_CUR); - - // Now read the new condensed tab table -*************** -*** 47,54 **** - float tmpTabPosition = 0.0f; - WPXTabStop tmpTabStop = WPXTabStop(); - -! while ((tmpTabType = read8(input)) & 0xff != 0xff) - { - tmpTabPosition = (float)((double)readU16(input, true) / 72.0f); - - if (tmpTabType < 0) ---- 47,56 ---- - float tmpTabPosition = 0.0f; - WPXTabStop tmpTabStop = WPXTabStop(); - -! while (((tmpTabType = read8(input)) & 0xff) != 0xff) - { -+ if (input->atEOS()) -+ throw FileException(); - tmpTabPosition = (float)((double)readU16(input, true) / 72.0f); - - if (tmpTabType < 0) -*** misc/libwpd-0.8.8/src/lib/WP1SubDocument.cpp Wed Jan 3 13:07:55 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP1SubDocument.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 26,32 **** - #include "WP1Parser.h" - #include "libwpd_internal.h" - -! WP1SubDocument::WP1SubDocument(WPXInputStream *input, const int dataSize) : - WPXSubDocument(input, dataSize) - { - } ---- 26,32 ---- - #include "WP1Parser.h" - #include "libwpd_internal.h" - -! WP1SubDocument::WP1SubDocument(WPXInputStream *input, const unsigned dataSize) : - WPXSubDocument(input, dataSize) - { - } -*** misc/libwpd-0.8.8/src/lib/WP1SubDocument.h Wed Jan 3 13:07:56 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP1SubDocument.h Thu Feb 21 11:37:54 2008 -*************** -*** 32,38 **** - class WP1SubDocument : public WPXSubDocument - { - public: -! WP1SubDocument(WPXInputStream *input, const int dataSize); - void parse(WP1Listener *listener) const; - - }; ---- 32,38 ---- - class WP1SubDocument : public WPXSubDocument - { - public: -! WP1SubDocument(WPXInputStream *input, const unsigned dataSize); - void parse(WP1Listener *listener) const; - - }; -*** misc/libwpd-0.8.8/src/lib/WP1VariableLengthGroup.cpp Wed Jan 3 13:07:55 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP1VariableLengthGroup.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 31,36 **** ---- 31,37 ---- - #include "WP1FootnoteEndnoteGroup.h" - #include "WP1FileStructure.h" - #include "libwpd_internal.h" -+ #include <limits> - - WP1VariableLengthGroup::WP1VariableLengthGroup(uint8_t group) - : m_group(group) -*************** -*** 60,65 **** ---- 61,68 ---- - try - { - uint32_t size = readU32(input, true); -+ if (size > ((std::numeric_limits<uint32_t>::max)() / 2)) -+ return false; - - if (input->seek(size, WPX_SEEK_CUR) || input->atEOS()) - { -*************** -*** 94,104 **** ---- 97,114 ---- - WPD_DEBUG_MSG(("WordPerfect: handling a variable length group\n")); - - m_size = readU32(input, true); // the length is the number of data bytes minus 4 (ie. the function codes) -+ -+ if (m_size + startPosition < startPosition) -+ throw FileException(); - - WPD_DEBUG_MSG(("WordPerfect: Read variable group header (start_position: %i, size: %i)\n", startPosition, m_size)); - - _readContents(input); - -+ if ((m_size + startPosition + 4 < m_size + startPosition) || -+ (m_size + startPosition + 4) > ((std::numeric_limits<uint32_t>::max)() / 2)) -+ throw FileException(); -+ - input->seek(startPosition + m_size + 4, WPX_SEEK_SET); - - if (m_size != readU32(input, true)) -*************** -*** 112,117 **** ---- 122,130 ---- - throw FileException(); - } - -+ if ((m_size + startPosition + 9 < m_size + startPosition) || -+ (m_size + startPosition + 9) > ((std::numeric_limits<uint32_t>::max)() / 2)) -+ throw FileException(); - input->seek(startPosition + m_size + 9, WPX_SEEK_SET); - - } -*** misc/libwpd-0.8.8/src/lib/WP3PageFormatGroup.cpp Fri Jan 5 10:21:13 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP3PageFormatGroup.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 91,98 **** - - m_isRelative = (readU8(input) & 0x01); - -! while ((tmpTabType = read8(input)) & 0xff != 0xff) - { - tmpTabPosition = fixedPointToFloat(readU32(input, true)) / 72.0f; - - if (tmpTabType < 0) ---- 91,100 ---- - - m_isRelative = (readU8(input) & 0x01); - -! while (((tmpTabType = read8(input)) & 0xff) != 0xff) - { -+ if (input->atEOS()) -+ throw FileException(); - tmpTabPosition = fixedPointToFloat(readU32(input, true)) / 72.0f; - - if (tmpTabType < 0) -*** misc/libwpd-0.8.8/src/lib/WP3SubDocument.cpp Wed Jan 3 13:07:55 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP3SubDocument.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 26,32 **** - #include "WP3Parser.h" - #include "libwpd_internal.h" - -! WP3SubDocument::WP3SubDocument(WPXInputStream *input, const int dataSize) : - WPXSubDocument(input, dataSize) - { - } ---- 26,32 ---- - #include "WP3Parser.h" - #include "libwpd_internal.h" - -! WP3SubDocument::WP3SubDocument(WPXInputStream *input, const unsigned dataSize) : - WPXSubDocument(input, dataSize) - { - } -*** misc/libwpd-0.8.8/src/lib/WP3SubDocument.h Wed Jan 3 13:07:56 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP3SubDocument.h Thu Feb 21 11:37:54 2008 -*************** -*** 32,38 **** - class WP3SubDocument : public WPXSubDocument - { - public: -! WP3SubDocument(WPXInputStream *input, const int dataSize); - void parse(WP3Listener *listener) const; - - }; ---- 32,38 ---- - class WP3SubDocument : public WPXSubDocument - { - public: -! WP3SubDocument(WPXInputStream *input, const unsigned dataSize); - void parse(WP3Listener *listener) const; - - }; -*** misc/libwpd-0.8.8/src/lib/WP3TablesGroup.cpp Wed Jan 3 13:07:55 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP3TablesGroup.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 50,59 **** - { - // this group can contain different kinds of data, thus we need to read - // the contents accordingly -! uint8_t i; - switch (getSubGroup()) - { - case WP3_TABLES_GROUP_TABLE_FUNCTION: - input->seek(71, WPX_SEEK_CUR); - m_tableMode = readU8(input); - m_offsetFromLeftEdge = readU32(input, true); ---- 50,61 ---- - { - // this group can contain different kinds of data, thus we need to read - // the contents accordingly -! uint8_t i=0; -! long startPosition = 0; - switch (getSubGroup()) - { - case WP3_TABLES_GROUP_TABLE_FUNCTION: -+ startPosition = input->tell(); - input->seek(71, WPX_SEEK_CUR); - m_tableMode = readU8(input); - m_offsetFromLeftEdge = readU32(input, true); -*************** -*** 63,70 **** ---- 65,76 ---- - m_rightGutterSpacing = readU32(input, true); - input->seek(3, WPX_SEEK_CUR); - m_numColumns = readU8(input); -+ if ((m_numColumns > 32) || ((input->tell() - startPosition + m_numColumns*10) > (getSize() - 4))) -+ throw FileException(); - for (i=0; i<m_numColumns; i++) - { -+ if (input->atEOS()) -+ throw FileException(); - m_columnMode[i] = readU8(input); - m_numberFormat[i] = readU8(input); - m_columnWidth[i] = readU32(input, true); -*************** -*** 120,126 **** - { - case WP3_TABLES_GROUP_TABLE_FUNCTION: - listener->defineTable(m_tableMode, fixedPointToWPUs(m_offsetFromLeftEdge)); -! for (i=0; i<m_numColumns; i++) - listener->addTableColumnDefinition(fixedPointToWPUs(m_columnWidth[i]), fixedPointToWPUs(m_leftGutterSpacing), - fixedPointToWPUs(m_rightGutterSpacing), 0, LEFT); - listener->startTable(); ---- 126,132 ---- - { - case WP3_TABLES_GROUP_TABLE_FUNCTION: - listener->defineTable(m_tableMode, fixedPointToWPUs(m_offsetFromLeftEdge)); -! for (i=0; i<m_numColumns && i <= 32; i++) - listener->addTableColumnDefinition(fixedPointToWPUs(m_columnWidth[i]), fixedPointToWPUs(m_leftGutterSpacing), - fixedPointToWPUs(m_rightGutterSpacing), 0, LEFT); - listener->startTable(); -*** misc/libwpd-0.8.8/src/lib/WP3VariableLengthGroup.cpp Wed Jan 3 13:07:55 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP3VariableLengthGroup.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 36,41 **** ---- 36,42 ---- - #include "WP3FootnoteEndnoteGroup.h" - #include "WP3TablesGroup.h" - #include "libwpd_internal.h" -+ #include <limits> - - WP3VariableLengthGroup::WP3VariableLengthGroup() - { -*************** -*** 72,82 **** ---- 73,90 ---- - bool WP3VariableLengthGroup::isGroupConsistent(WPXInputStream *input, const uint8_t group) - { - uint32_t startPosition = input->tell(); -+ if (startPosition > ((std::numeric_limits<unsigned long>::max)() / 2)) -+ return false; - - try - { - uint8_t subGroup = readU8(input); - uint16_t size = readU16(input, true); -+ if (startPosition + size < startPosition) -+ { -+ input->seek(startPosition, WPX_SEEK_SET); -+ return false; -+ } - - if (input->seek((startPosition + size - 1 - input->tell()), WPX_SEEK_CUR) || input->atEOS()) - { -*** misc/libwpd-0.8.8/src/lib/WP42SubDocument.cpp Wed Jan 3 13:07:55 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP42SubDocument.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 26,37 **** - #include "WP42Parser.h" - #include "libwpd_internal.h" - -! WP42SubDocument::WP42SubDocument(uint8_t * streamData, const int dataSize) : - WPXSubDocument(streamData, dataSize) - { - } - -! WP42SubDocument::WP42SubDocument(WPXInputStream *input, const int dataSize) : - WPXSubDocument(input, dataSize) - { - } ---- 26,37 ---- - #include "WP42Parser.h" - #include "libwpd_internal.h" - -! WP42SubDocument::WP42SubDocument(uint8_t * streamData, const unsigned dataSize) : - WPXSubDocument(streamData, dataSize) - { - } - -! WP42SubDocument::WP42SubDocument(WPXInputStream *input, const unsigned dataSize) : - WPXSubDocument(input, dataSize) - { - } -*** misc/libwpd-0.8.8/src/lib/WP42SubDocument.h Wed Jan 3 13:07:56 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP42SubDocument.h Thu Feb 21 11:37:54 2008 -*************** -*** 32,39 **** - class WP42SubDocument : public WPXSubDocument - { - public: -! WP42SubDocument(uint8_t * streamData, const int dataSize); -! WP42SubDocument(WPXInputStream *input, const int dataSize); - void parse(WP42Listener *listener) const; - - }; ---- 32,39 ---- - class WP42SubDocument : public WPXSubDocument - { - public: -! WP42SubDocument(uint8_t * streamData, const unsigned dataSize); -! WP42SubDocument(WPXInputStream *input, const unsigned dataSize); - void parse(WP42Listener *listener) const; - - }; -*** misc/libwpd-0.8.8/src/lib/WP5DefinitionGroup.cpp Wed Jan 3 13:07:55 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP5DefinitionGroup.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 26,32 **** - #include "WP5Listener.h" - #include "libwpd_internal.h" - -! WP5DefinitionGroup_DefineTablesSubGroup::WP5DefinitionGroup_DefineTablesSubGroup(WPXInputStream *input) : - WP5VariableLengthGroup_SubGroup(), - m_position(0), - m_numColumns(0), ---- 26,32 ---- - #include "WP5Listener.h" - #include "libwpd_internal.h" - -! WP5DefinitionGroup_DefineTablesSubGroup::WP5DefinitionGroup_DefineTablesSubGroup(WPXInputStream *input, uint16_t subGroupSize) : - WP5VariableLengthGroup_SubGroup(), - m_position(0), - m_numColumns(0), -*************** -*** 34,39 **** ---- 34,40 ---- - m_leftGutter(0), - m_rightGutter(0) - { -+ long startPosition = input->tell(); - // Skip useless old values to read the old column number - input->seek(2, WPX_SEEK_CUR); - m_numColumns = readU16(input); -*************** -*** 50,61 **** ---- 51,76 ---- - input->seek(10, WPX_SEEK_CUR); - m_leftOffset = readU16(input); - int i; -+ if ((m_numColumns > 32) || ((input->tell() - startPosition + m_numColumns*5) > (subGroupSize - 4))) -+ throw FileException(); - for (i=0; i < m_numColumns; i++) -+ { -+ if (input->atEOS()) -+ throw FileException(); - m_columnWidth[i] = readU16(input); -+ } - for (i=0; i < m_numColumns; i++) -+ { -+ if (input->atEOS()) -+ throw FileException(); - m_attributeBits[i] = readU16(input); -+ } - for (i=0; i < m_numColumns; i++) -+ { -+ if (input->atEOS()) -+ throw FileException(); - m_columnAlignment[i] = readU8(input); -+ } - } - - void WP5DefinitionGroup_DefineTablesSubGroup::parse(WP5Listener *listener) -*************** -*** 88,94 **** - switch(getSubGroup()) - { - case WP5_TOP_DEFINITION_GROUP_DEFINE_TABLES: -! m_subGroupData = new WP5DefinitionGroup_DefineTablesSubGroup(input); - break; - default: - break; ---- 103,109 ---- - switch(getSubGroup()) - { - case WP5_TOP_DEFINITION_GROUP_DEFINE_TABLES: -! m_subGroupData = new WP5DefinitionGroup_DefineTablesSubGroup(input, getSize()); - break; - default: - break; -*** misc/libwpd-0.8.8/src/lib/WP5DefinitionGroup.h Wed Jan 3 13:07:56 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP5DefinitionGroup.h Thu Feb 21 11:37:54 2008 -*************** -*** 31,37 **** - class WP5DefinitionGroup_DefineTablesSubGroup : public WP5VariableLengthGroup_SubGroup - { - public: -! WP5DefinitionGroup_DefineTablesSubGroup(WPXInputStream *input); - void parse(WP5Listener *listener); - - private: ---- 31,37 ---- - class WP5DefinitionGroup_DefineTablesSubGroup : public WP5VariableLengthGroup_SubGroup - { - public: -! WP5DefinitionGroup_DefineTablesSubGroup(WPXInputStream *input, uint16_t subGroupSize); - void parse(WP5Listener *listener); - - private: -*************** -*** 58,64 **** - - private: - WP5VariableLengthGroup_SubGroup * m_subGroupData; -- - }; - - #endif /* WP5DEFINITIONGROUP_H */ ---- 58,63 ---- -*** misc/libwpd-0.8.8/src/lib/WP5SubDocument.cpp Wed Jan 3 13:07:55 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP5SubDocument.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 26,32 **** - #include "WP5Parser.h" - #include "libwpd_internal.h" - -! WP5SubDocument::WP5SubDocument(WPXInputStream *input, const int dataSize) : - WPXSubDocument(input, dataSize) - { - } ---- 26,32 ---- - #include "WP5Parser.h" - #include "libwpd_internal.h" - -! WP5SubDocument::WP5SubDocument(WPXInputStream *input, const unsigned dataSize) : - WPXSubDocument(input, dataSize) - { - } -*** misc/libwpd-0.8.8/src/lib/WP5SubDocument.h Wed Jan 3 13:07:56 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP5SubDocument.h Thu Feb 21 11:37:54 2008 -*************** -*** 32,38 **** - class WP5SubDocument : public WPXSubDocument - { - public: -! WP5SubDocument(WPXInputStream *input, const int dataSize); - void parse(WP5Listener *listener) const; - - }; ---- 32,38 ---- - class WP5SubDocument : public WPXSubDocument - { - public: -! WP5SubDocument(WPXInputStream *input, const unsigned dataSize); - void parse(WP5Listener *listener) const; - - }; -*** misc/libwpd-0.8.8/src/lib/WP6ExtendedDocumentSummaryPacket.cpp Fri Jan 5 10:30:07 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP6ExtendedDocumentSummaryPacket.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 24,29 **** ---- 24,30 ---- - * Corel Corporation or Corel Corporation Limited." - */ - #include <string.h> -+ #include <limits> - - #include "WP6ExtendedDocumentSummaryPacket.h" - #include "libwpd_internal.h" -*************** -*** 47,52 **** ---- 48,55 ---- - { - if (m_dataSize <= 0) - return; -+ if (m_dataSize > ((std::numeric_limits<uint32_t>::max)() / 2)) -+ m_dataSize = ((std::numeric_limits<uint32_t>::max)() / 2); - uint8_t *streamData = new uint8_t[m_dataSize]; - for(unsigned i=0; i<(unsigned)m_dataSize; i++) - streamData[i] = readU8(input); -*** misc/libwpd-0.8.8/src/lib/WP6FontDescriptorPacket.cpp Thu Jan 4 11:52:35 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP6FontDescriptorPacket.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 23,29 **** - * Corel Corporation or Corel Corporation Limited." - */ - #include <string.h> -! - #include "WP6FontDescriptorPacket.h" - #include "libwpd_internal.h" - ---- 23,29 ---- - * Corel Corporation or Corel Corporation Limited." - */ - #include <string.h> -! #include <limits> - #include "WP6FontDescriptorPacket.h" - #include "libwpd_internal.h" - -*************** -*** 69,77 **** - - m_fontNameLength = readU16(input); - -! // TODO: re-do sanity checking -! //if(m_fontNameLength < WP_FONT_NAME_MAX_LENGTH) -! //{ - if (m_fontNameLength == 0) - { - m_fontName = new char[1]; ---- 69,77 ---- - - m_fontNameLength = readU16(input); - -! -! if (m_fontNameLength > ((std::numeric_limits<uint16_t>::max)() / 2)) -! m_fontNameLength = ((std::numeric_limits<uint16_t>::max)() / 2); - if (m_fontNameLength == 0) - { - m_fontName = new char[1]; -*** misc/libwpd-0.8.8/src/lib/WP6GeneralTextPacket.cpp Wed Jan 3 13:07:55 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP6GeneralTextPacket.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 43,48 **** ---- 43,49 ---- - - void WP6GeneralTextPacket::_readContents(WPXInputStream *input) - { -+ long startPosition = input->tell(); - uint16_t numTextBlocks = readU16(input); - input->seek(4, WPX_SEEK_CUR); - -*************** -*** 53,65 **** - } - - uint32_t *blockSizes = new uint32_t[numTextBlocks]; -! int totalSize = 0; -! unsigned int i; - - for(i=0; i<numTextBlocks; i++) - { - blockSizes[i] = readU32(input); -! totalSize += blockSizes[i]; - } - - if (totalSize <= 0) ---- 54,71 ---- - } - - uint32_t *blockSizes = new uint32_t[numTextBlocks]; -! unsigned int totalSize = 0; -! unsigned int i = 0; - - for(i=0; i<numTextBlocks; i++) - { -+ if ((input->tell() - startPosition + 4) > getDataSize() || input->atEOS()) -+ throw FileException(); - blockSizes[i] = readU32(input); -! unsigned int newTotalSize = totalSize + blockSizes[i]; -! if (newTotalSize < totalSize) -! throw FileException(); -! totalSize = newTotalSize; - } - - if (totalSize <= 0) -*************** -*** 73,78 **** ---- 79,86 ---- - int streamPos = 0; - for(i=0; i<numTextBlocks; i++) - { -+ if ((input->tell() - startPosition + blockSizes[i]) > getDataSize() || input->atEOS()) -+ throw FileException(); - for (unsigned int j=0; j<blockSizes[i]; j++) - { - streamData[streamPos] = readU8(input); -*** misc/libwpd-0.8.8/src/lib/WP6PrefixDataPacket.cpp Wed Jan 3 13:07:55 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP6PrefixDataPacket.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 35,41 **** - #include "libwpd.h" - #include "libwpd_internal.h" - -! WP6PrefixDataPacket::WP6PrefixDataPacket(WPXInputStream * /* input */) - { - } - ---- 35,42 ---- - #include "libwpd.h" - #include "libwpd_internal.h" - -! WP6PrefixDataPacket::WP6PrefixDataPacket(WPXInputStream * /* input */) : -! m_dataSize(0) - { - } - -*************** -*** 74,80 **** - - void WP6PrefixDataPacket::_read(WPXInputStream *input, uint32_t dataOffset, uint32_t dataSize) - { -! if (!dataSize) - return; - - input->seek(dataOffset, WPX_SEEK_SET); ---- 75,83 ---- - - void WP6PrefixDataPacket::_read(WPXInputStream *input, uint32_t dataOffset, uint32_t dataSize) - { -! m_dataSize = dataSize; -! -! if (!m_dataSize) - return; - - input->seek(dataOffset, WPX_SEEK_SET); -*** misc/libwpd-0.8.8/src/lib/WP6PrefixDataPacket.h Wed Jan 3 13:07:56 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP6PrefixDataPacket.h Thu Feb 21 11:37:54 2008 -*************** -*** 39,50 **** ---- 39,54 ---- - virtual ~WP6PrefixDataPacket() {} - virtual void parse(WP6Listener * /* listener */) const {} - virtual WP6SubDocument * getSubDocument() const { return 0; } -+ const uint32_t getDataSize() const { return m_dataSize; } - - static WP6PrefixDataPacket * constructPrefixDataPacket(WPXInputStream * input, WP6PrefixIndice *prefixIndice); - - protected: - virtual void _readContents(WPXInputStream *input) = 0; - void _read(WPXInputStream *input, uint32_t dataOffset, uint32_t dataSize); -+ -+ private: -+ uint32_t m_dataSize; - }; - - #endif /* WP6PREFIXDATAPACKET_H */ -*** misc/libwpd-0.8.8/src/lib/WP6SubDocument.cpp Wed Jan 3 13:07:55 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP6SubDocument.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 26,32 **** - #include "WP6Parser.h" - #include "libwpd_internal.h" - -! WP6SubDocument::WP6SubDocument(uint8_t * streamData, const int dataSize) : - WPXSubDocument(streamData, dataSize) - { - } ---- 26,32 ---- - #include "WP6Parser.h" - #include "libwpd_internal.h" - -! WP6SubDocument::WP6SubDocument(uint8_t * streamData, const unsigned dataSize) : - WPXSubDocument(streamData, dataSize) - { - } -*** misc/libwpd-0.8.8/src/lib/WP6SubDocument.h Wed Jan 3 13:07:56 2007 ---- misc/build/libwpd-0.8.8/src/lib/WP6SubDocument.h Thu Feb 21 11:37:54 2008 -*************** -*** 32,38 **** - class WP6SubDocument : public WPXSubDocument - { - public: -! WP6SubDocument(uint8_t * streamData, const int dataSize); - void parse(WP6Listener *listener) const; - }; - #endif /* WP6SUBDOCUMENT_H */ ---- 32,38 ---- - class WP6SubDocument : public WPXSubDocument - { - public: -! WP6SubDocument(uint8_t * streamData, const unsigned dataSize); - void parse(WP6Listener *listener) const; - }; - #endif /* WP6SUBDOCUMENT_H */ -*** misc/libwpd-0.8.8/src/lib/WPXHeader.cpp Wed Jan 3 16:40:14 2007 ---- misc/build/libwpd-0.8.8/src/lib/WPXHeader.cpp Thu Feb 21 11:40:46 2008 -*************** -*** 31,36 **** ---- 31,37 ---- - #include "WP61Header.h" - #include "WPXFileStructure.h" - #include "libwpd_internal.h" -+ #include <string.h> - - WPXHeader::WPXHeader(WPXInputStream * /* input */, uint32_t documentOffset, uint8_t productType, - uint8_t fileType, uint8_t majorVersion, uint8_t minorVersion, uint16_t documentEncryption) : -*** misc/libwpd-0.8.8/src/lib/WPXSubDocument.cpp Wed Jan 3 13:07:56 2007 ---- misc/build/libwpd-0.8.8/src/lib/WPXSubDocument.cpp Thu Feb 21 11:37:54 2008 -*************** -*** 32,49 **** - { - } - -! WPXSubDocument::WPXSubDocument(WPXInputStream *input, const int dataSize) : - m_stream(0) - { - uint8_t *streamData = new uint8_t[dataSize]; - for (int i=0; i<dataSize; i++) - { - streamData[i] = readU8(input); - } - m_stream = new WPXMemoryInputStream(streamData, dataSize); - } - -! WPXSubDocument::WPXSubDocument(uint8_t * streamData, const int dataSize) : - m_stream(0) - { - m_stream = new WPXMemoryInputStream(streamData, dataSize); ---- 32,51 ---- - { - } - -! WPXSubDocument::WPXSubDocument(WPXInputStream *input, const unsigned dataSize) : - m_stream(0) - { - uint8_t *streamData = new uint8_t[dataSize]; - for (int i=0; i<dataSize; i++) - { -+ if (input->atEOS()) -+ throw FileException(); - streamData[i] = readU8(input); - } - m_stream = new WPXMemoryInputStream(streamData, dataSize); - } - -! WPXSubDocument::WPXSubDocument(uint8_t * streamData, const unsigned dataSize) : - m_stream(0) - { - m_stream = new WPXMemoryInputStream(streamData, dataSize); -*** misc/libwpd-0.8.8/src/lib/WPXSubDocument.h Wed Jan 3 13:07:56 2007 ---- misc/build/libwpd-0.8.8/src/lib/WPXSubDocument.h Thu Feb 21 11:37:54 2008 -*************** -*** 33,40 **** - { - public: - WPXSubDocument(); -! WPXSubDocument(WPXInputStream *input, const int dataSize); -! WPXSubDocument(uint8_t * streamData, const int dataSize); - virtual ~WPXSubDocument(); - WPXMemoryInputStream *getStream() const { return m_stream;} - ---- 33,40 ---- - { - public: - WPXSubDocument(); -! WPXSubDocument(WPXInputStream *input, const unsigned dataSize); -! WPXSubDocument(uint8_t * streamData, const unsigned dataSize); - virtual ~WPXSubDocument(); - WPXMemoryInputStream *getStream() const { return m_stream;} - -*** misc/libwpd-0.8.8/src/lib/makefile.mk Tue Nov 14 14:45:50 2006 ---- misc/build/libwpd-0.8.8/src/lib/makefile.mk Thu Feb 21 11:37:54 2008 -*************** -*** 7,15 **** - ENABLE_EXCEPTIONS=TRUE - LIBTARGET=NO - -- .INCLUDE : svpre.mk - .INCLUDE : settings.mk -- .INCLUDE : sv.mk - - .IF "$(GUI)"=="WNT" - CFLAGS+=-GR ---- 7,13 ---- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-libs-extern-3.3.0.3/libwpd/makefile.mk new/libreoffice-libs-extern-3.3.1.2/libwpd/makefile.mk --- old/libreoffice-libs-extern-3.3.0.3/libwpd/makefile.mk 2010-11-16 20:30:49.000000000 +0100 +++ new/libreoffice-libs-extern-3.3.1.2/libwpd/makefile.mk 2011-02-02 13:15:13.000000000 +0100 @@ -41,8 +41,8 @@ @echo "Using system libwpd..." .ENDIF -TARFILE_NAME=libwpd-0.9.0 -TARFILE_MD5=86e390f015e505dd71a66f0123c62f09 +TARFILE_NAME=libwpd-0.9.1 +TARFILE_MD5=5ff846847dab351604ad859e2fd4ed3c BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) BUILD_DIR=src$/lib ++++++ libreoffice-libs-extern-sys-3.3.0.3.tar.bz2 -> libreoffice-libs-extern-sys-3.3.1.2.tar.bz2 ++++++ libreoffice-libs-extern/libreoffice-libs-extern-sys-3.3.0.3.tar.bz2 libreoffice-libs-extern/libreoffice-libs-extern-sys-3.3.1.2.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
