INTEGRATION: CWS fs08 (1.1.2); FILE ADDED

2007/01/15 13:49:31 thb 1.1.2.6: Make that buildable under Windows
2007/01/15 10:29:24 fridrich_strba 1.1.2.5: some more fixes
2007/01/12 23:21:22 fridrich_strba 1.1.2.4: some more checks added
2007/01/11 21:53:42 fridrich_strba 1.1.2.3: build fix
2007/01/11 18:22:47 fridrich_strba 1.1.2.2: some more belts and braces enhancing stability and security
2007/01/09 15:37:58 fridrich_strba 1.1.2.1: fixing a little insignificant regression

1 files changed, 690 insertions, 0 deletions

diff --git a/libwpd/libwpd-0.8.8.diff b/libwpd/libwpd-0.8.8.diff
new file mode 100644
index 000000000000..c1a0d8f0b131
--- /dev/null
+++ b/libwpd/libwpd-0.8.8.diff
@@ -0,0 +1,690 @@
+*** misc/libwpd-0.8.8/src/lib/WP1Part.cpp	2007-01-03 14:07:55.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP1Part.cpp	2007-01-13 00:18:52.000000000 +0100
+***************
+*** 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	2007-01-05 11:21:16.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP1SetTabsGroup.cpp	2007-01-13 00:18:52.000000000 +0100
+***************
+*** 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	2007-01-03 14:07:55.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP1SubDocument.cpp	2007-01-15 11:03:37.000000000 +0100
+***************
+*** 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	2007-01-03 14:07:56.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP1SubDocument.h	2007-01-15 11:03:37.000000000 +0100
+***************
+*** 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/WP3PageFormatGroup.cpp	2007-01-05 11:21:13.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP3PageFormatGroup.cpp	2007-01-13 00:18:52.000000000 +0100
+***************
+*** 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	2007-01-03 14:07:55.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP3SubDocument.cpp	2007-01-15 11:03:37.000000000 +0100
+***************
+*** 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	2007-01-03 14:07:56.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP3SubDocument.h	2007-01-15 11:03:37.000000000 +0100
+***************
+*** 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	2007-01-03 14:07:55.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP3TablesGroup.cpp	2007-01-13 00:18:52.000000000 +0100
+***************
+*** 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/WP42SubDocument.cpp	2007-01-03 14:07:55.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP42SubDocument.cpp	2007-01-15 11:03:37.000000000 +0100
+***************
+*** 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	2007-01-03 14:07:56.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP42SubDocument.h	2007-01-15 11:03:37.000000000 +0100
+***************
+*** 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	2007-01-03 14:07:55.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP5DefinitionGroup.cpp	2007-01-13 00:18:52.000000000 +0100
+***************
+*** 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	2007-01-03 14:07:56.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP5DefinitionGroup.h	2007-01-13 00:18:52.000000000 +0100
+***************
+*** 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	2007-01-03 14:07:55.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP5SubDocument.cpp	2007-01-15 11:03:37.000000000 +0100
+***************
+*** 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	2007-01-03 14:07:56.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP5SubDocument.h	2007-01-15 11:03:37.000000000 +0100
+***************
+*** 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	2007-01-05 11:30:07.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP6ExtendedDocumentSummaryPacket.cpp	2007-01-15 11:03:37.000000000 +0100
+***************
+*** 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	2007-01-04 12:52:35.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP6FontDescriptorPacket.cpp	2007-01-15 11:03:37.000000000 +0100
+***************
+*** 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	2007-01-03 14:07:55.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP6GeneralTextPacket.cpp	2007-01-13 00:18:52.000000000 +0100
+***************
+*** 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	2007-01-03 14:07:55.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP6PrefixDataPacket.cpp	2007-01-13 00:18:52.000000000 +0100
+***************
+*** 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	2007-01-03 14:07:56.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP6PrefixDataPacket.h	2007-01-13 00:18:52.000000000 +0100
+***************
+*** 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	2007-01-03 14:07:55.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP6SubDocument.cpp	2007-01-15 11:03:37.000000000 +0100
+***************
+*** 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	2007-01-03 14:07:56.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WP6SubDocument.h	2007-01-15 11:03:37.000000000 +0100
+***************
+*** 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/WPXSubDocument.cpp	2007-01-03 14:07:56.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WPXSubDocument.cpp	2007-01-15 11:03:37.000000000 +0100
+***************
+*** 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	2007-01-03 14:07:56.000000000 +0100
+--- misc/build/libwpd-0.8.8/src/lib/WPXSubDocument.h	2007-01-15 11:03:37.000000000 +0100
+***************
+*** 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;}
+