DocFormat - правка багов (файлы com-сервера)

ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp

@@ -256,6 +256,7 @@ namespace DocFileFormat
 					if( nIndex < _doc->FontTable->cData )
 					{
 						FontFamilyName* ffn = static_cast<FontFamilyName*>( _doc->FontTable->operator [] ( nIndex ) );
+						if (ffn)
 							this->m_sDefaultFont = ffn->xszFtn;
 					}
 				}break;

ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h

@@ -61,6 +61,7 @@ namespace DocFileFormat
 					while ( ( cp - m_document->FIB->m_RgLw97.ccpText - m_document->FIB->m_RgLw97.ccpFtn - m_document->FIB->m_RgLw97.ccpHdr ) < (*m_document->IndividualCommentsPlex)[index + 1] )
 					{
 						int fc = m_document->FindFileCharPos(cp);
+						if (fc < 0) break;
 
 						ParagraphPropertyExceptions* papx = findValidPapx(fc);
 						TableInfo tai(papx);

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -127,6 +127,9 @@ namespace DocFileFormat
 		int		fc							=	m_document->FindFileCharPos(cp); 
 		int		fcEnd						=	m_document->FindFileCharPos(cpEnd);
 
+		if (fc < 0 || fcEnd < 0) 
+			return 0;
+		
 		ParagraphPropertyExceptions* papx	=	findValidPapx(fc);
 
 		// get all CHPX between these boundaries to determine the count of runs
@@ -515,6 +518,7 @@ namespace DocFileFormat
 					std::wstring mergeformat( _T( " MERGEFORMAT" ) );
 					std::wstring quote		( _T( " QUOTE" ) );
 					std::wstring chart		( _T( "Chart" ) );
+					std::wstring PBrush		( _T( " PBrush" ) );
 
 					if ( search( f.begin(), f.end(), form.begin(), form.end() ) != f.end() )
 					{
@@ -1039,6 +1043,7 @@ namespace DocFileFormat
 		TableInfo tai( papx );
 
 		int fcRowEnd = findRowEndFc( cp, cp, nestingLevel );
+		ParagraphPropertyExceptions* papx_prev = NULL;
 
 		while ( tai.fInTable )
 		{
@@ -1073,6 +1078,10 @@ namespace DocFileFormat
 			papx = findValidPapx( fcRowEnd );
 			tai = TableInfo( papx );
 			fcRowEnd = findRowEndFc( cp, cp, nestingLevel );
+
+			if (papx_prev && papx_prev == papx )
+				break;//file(12).doc
+			papx_prev = papx;
 		}
 
 		//build the grid based on the boundaries
@@ -1123,8 +1132,12 @@ namespace DocFileFormat
 			//Search the "table trailer paragraph"
 			while ( ( tai.fTtp == false ) && ( tai.fInTable == true ) )
 			{
-				while ( m_document->Text->at( cp ) != TextMark::CellOrRowMark )
+				while ( true )
 				{
+					if (cp >= m_document->Text->size())
+						break;
+					if (m_document->Text->at( cp ) == TextMark::CellOrRowMark)
+						break;
 					cp++;
 				}
 

ASCOfficeDocFile/DocDocxConverter/EndnotesMapping.h

@@ -45,6 +45,7 @@ namespace DocFileFormat
 					while ( ( cp - m_document->FIB->m_RgLw97.ccpText - m_document->FIB->m_RgLw97.ccpFtn - m_document->FIB->m_RgLw97.ccpHdr - m_document->FIB->m_RgLw97.ccpAtn ) < (*m_document->IndividualEndnotesPlex)[id + 1] )
 					{
 						int fc =  m_document->FindFileCharPos(cp); 
+						if (fc < 0) break;
 
 						ParagraphPropertyExceptions* papx = findValidPapx( fc );
 						TableInfo tai( papx );

ASCOfficeDocFile/DocDocxConverter/FooterMapping.cpp

@@ -37,6 +37,8 @@ namespace DocFileFormat
 		while ( cp < cpMax )
 		{
 			int fc =  m_document->FindFileCharPos(cp);
+			if (fc < 0) break;
+
 			ParagraphPropertyExceptions* papx = findValidPapx( fc );
 			TableInfo tai( papx );
 

ASCOfficeDocFile/DocDocxConverter/FootnotesMapping.h

@@ -45,6 +45,8 @@ namespace DocFileFormat
 					while ( ( cp - m_document->FIB->m_RgLw97.ccpText ) < (*m_document->IndividualFootnotesPlex)[id + 1] )
 					{
 						int fc =  m_document->FindFileCharPos(cp);
+						if (fc < 0) break;
+
 						ParagraphPropertyExceptions* papx = findValidPapx( fc );
 						TableInfo tai( papx );
 

ASCOfficeDocFile/DocDocxConverter/HeaderMapping.cpp

@@ -37,6 +37,8 @@ namespace DocFileFormat
 		while ( cp < cpMax )
 		{
 			int fc = m_document->FindFileCharPos(cp);
+			if (fc < 0) break;
+
 			ParagraphPropertyExceptions* papx = findValidPapx( fc );
 			TableInfo tai( papx );
 

ASCOfficeDocFile/DocDocxConverter/ListLevel.cpp

@@ -63,9 +63,12 @@ namespace DocFileFormat
 
         //read the number text
 		short strLen = reader->ReadInt16();
+		if (strLen > 0)//file(14).doc
+		{
 			bytes = reader->ReadBytes( ( strLen * 2 ), true );
 			FormatUtils::GetSTLCollectionFromBytes<wstring>( &(this->xst), bytes, ( strLen * 2 ), ENCODING_UNICODE );
 			RELEASEARRAYOBJECTS( bytes );
+		}
 
 		long endPos = reader->GetPosition();
         reader->Seek( startPos, 0/*STREAM_SEEK_SET*/ );

ASCOfficeDocFile/DocDocxConverter/MainDocumentMapping.cpp

@@ -65,6 +65,7 @@ namespace DocFileFormat
 		while (cp < countText)
 		{
 			fc = m_document->FindFileCharPos(cp);
+			if (fc < 0) break;
 
 			papx = findValidPapx(fc);
 
@@ -97,6 +98,8 @@ namespace DocFileFormat
 				int fc						=	m_document->FindFileCharPos(0);
 				int fcEnd					=	m_document->FindFileCharPos(countTextRel);
 
+				if (fc < 0 || fcEnd < 0) break;
+				
 				// Read the chars
 				vector<wchar_t>* chpxChars	=	m_document->m_PieceTable->GetEncodingChars (fc, fcEnd, m_document->WordDocumentStream);		//<! NEED OPTIMIZE
 				wstring text (chpxChars->begin(), chpxChars->end());

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp

@@ -443,6 +443,8 @@ namespace DocFileFormat
 			int fc		=	m_document->FindFileCharPos(iter->second);
 			int fcEnd	=	m_document->FindFileCharPos(iter->second + 1);
 
+			if (fc < 0 || fcEnd < 0 ) break;
+
 			list<CharacterPropertyExceptions*>* chpxs = m_document->GetCharacterPropertyExceptions(fc, fcEnd);
 
 			if ((chpxs != NULL) && (!chpxs->empty()))

ASCOfficeDocFile/DocDocxConverter/PictureDescriptor.cpp

@@ -123,7 +123,7 @@ namespace DocFileFormat
 				}
 
 				//Parse the OfficeDrawing Stuff
-				shapeContainer	=	static_cast<ShapeContainer*>(RecordFactory::ReadRecord(&reader, 0));
+				shapeContainer	=	dynamic_cast<ShapeContainer*>(RecordFactory::ReadRecord(&reader, 0));
 
 				long pos = reader.GetPosition();
 

ASCOfficeDocFile/DocDocxConverter/StyleSheetMapping.cpp

@@ -43,7 +43,7 @@ namespace DocFileFormat
 		m_pXmlWriter->WriteNodeEnd( _T( "w:docDefaults" ) );
 
 		//write the default styles
-		if ( sheet->Styles->at( 11 ) == NULL )
+		if ( (sheet->Styles->size() < 12) || (sheet->Styles->at( 11 ) == NULL ))
 		{
 			//NormalTable
 			writeNormalTableStyle();
@@ -210,15 +210,19 @@ namespace DocFileFormat
 		m_pXmlWriter->WriteNodeBegin( _T( "w:rFonts" ), TRUE );
 
 		FontFamilyName* ffnAscii = static_cast<FontFamilyName*>( m_document->FontTable->operator [] ( sheet->stshi->rgftcStandardChpStsh[0] ) );
+		if (ffnAscii)
 			m_pXmlWriter->WriteAttribute( _T( "w:ascii" ), FormatUtils::XmlEncode(ffnAscii->xszFtn).c_str() );
 
 		FontFamilyName* ffnAsia = static_cast<FontFamilyName*>( m_document->FontTable->operator [] ( sheet->stshi->rgftcStandardChpStsh[1] ) );
+		if (ffnAsia)
 			m_pXmlWriter->WriteAttribute( _T( "w:eastAsia" ), FormatUtils::XmlEncode(ffnAsia->xszFtn).c_str() );
 
 		FontFamilyName* ffnAnsi = static_cast<FontFamilyName*>( m_document->FontTable->operator [] ( sheet->stshi->rgftcStandardChpStsh[2] ) );
+		if (ffnAnsi)
 			m_pXmlWriter->WriteAttribute( _T( "w:hAnsi" ), FormatUtils::XmlEncode(ffnAnsi->xszFtn).c_str() );
 
 		FontFamilyName* ffnComplex = static_cast<FontFamilyName*>( m_document->FontTable->operator [] ( sheet->stshi->rgftcStandardChpStsh[3] ) );
+		if (ffnComplex)
 			m_pXmlWriter->WriteAttribute( _T( "w:cs" ), FormatUtils::XmlEncode(ffnComplex->xszFtn).c_str() );
 
 		m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );

ASCOfficeDocFile/DocDocxConverter/TableMapping.cpp

@@ -264,6 +264,7 @@ namespace DocFileFormat
 	bool Table::IsCellMarker(int _cp)
 	{
 		int fc = documentMapping->m_document->FindFileCharPos(_cp);
+		if (fc < 0) return false;
 
 		ParagraphPropertyExceptions* papx = NULL;
 
@@ -280,6 +281,7 @@ namespace DocFileFormat
 	bool Table::IsRowMarker( int _cp )
 	{
 		int fc = documentMapping->m_document->FindFileCharPos(_cp);
+		if (fc < 0) return false;
 
 		ParagraphPropertyExceptions* papx = NULL;
 
@@ -296,6 +298,7 @@ namespace DocFileFormat
 	bool Table::IsParagraphMarker( int _cp )
 	{
 		int fc = documentMapping->m_document->FindFileCharPos(_cp);
+		if (fc < 0) return false;
 
 		ParagraphPropertyExceptions* papx = NULL;
 
@@ -318,6 +321,7 @@ namespace DocFileFormat
 			SectionPropertyExceptions* sepxBackup = this->documentMapping->_lastValidSepx;
 
 			int fc = documentMapping->m_document->FindFileCharPos(_cp);
+			if (fc < 0) return;
 
 			ParagraphPropertyExceptions* papx = NULL;
 
@@ -331,6 +335,7 @@ namespace DocFileFormat
 			do
 			{
 				fc = documentMapping->m_document->FindFileCharPos(_cp);
+				if (fc < 0) break;
 
 				papx = this->documentMapping->findValidPapx( fc );
 
@@ -345,6 +350,7 @@ namespace DocFileFormat
 					_cp = innerTable.GetCPEnd();
 
 					fc = documentMapping->m_document->FindFileCharPos(_cp);
+					if (fc < 0) break;
 
 					papx = this->documentMapping->findValidPapx( fc );
 

ASCOfficeDocFile/DocDocxConverter/TextboxMapping.cpp

@@ -82,12 +82,18 @@ namespace DocFileFormat
 				m_document->FIB->m_RgLw97.ccpEdn;
 
 			if (typeid(*_caller) == typeid(MainDocumentMapping))
+			{
+				if (m_nTBIndex < m_document->TextboxBreakPlex->Elements.size() )//file(21).doc
 				{
 					bkd				=	static_cast<Tbkd*>(m_document->TextboxBreakPlex->Elements[m_nTBIndex]);
+				}
 
+				if (m_nTBIndex < m_document->TextboxBreakPlex->CharacterPositions.size() - 1)
+				{				
 					cp					=	txtbxSubdocStart + m_document->TextboxBreakPlex->CharacterPositions[m_nTBIndex];
 					cpEnd				=	txtbxSubdocStart + m_document->TextboxBreakPlex->CharacterPositions[m_nTBIndex + 1];
 				}
+			}
 			else if ((typeid(*_caller) == typeid(HeaderMapping)) || (typeid(*_caller) == typeid(FooterMapping)))
 			{
 				txtbxSubdocStart	+=	m_document->FIB->m_RgLw97.ccpTxbx;
@@ -101,11 +107,17 @@ namespace DocFileFormat
 			//convert the textbox text
 			_lastValidPapx = (*(m_document->AllPapxFkps->begin()))->grppapx[0];
 
+			ParagraphPropertyExceptions* papx_prev = NULL;
 			while (cp < cpEnd)
 			{
 				int fc = m_document->FindFileCharPos(cp);
+				if (fc < 0) break;
 
 				ParagraphPropertyExceptions* papx = findValidPapx( fc );
+				if (papx_prev && papx_prev == papx)//file(21).doc
+					break;
+				papx_prev = papx;
+
 				TableInfo tai( papx );
 
 				if ( tai.fInTable )

ASCOfficeDocFile/DocDocxConverter/VirtualStreamReader.h

@@ -27,7 +27,7 @@ public:
 	{
 		unsigned short rdUShort = 0;
 
-		if ( stream != NULL )
+		if (( stream != NULL ) && (position + 2 < stream->size()))
 		{		
 			stream->seek( position );
 			stream->read((unsigned char*)(&rdUShort), sizeof( rdUShort ));
@@ -42,7 +42,7 @@ public:
 	{
 		short rdShort = 0;
 
-		if ( stream != NULL )
+		if (( stream != NULL ) && (position + 2 < stream->size()))
 		{
 			stream->seek( position );
 			stream->read((unsigned char*)(&rdShort), sizeof( rdShort ));
@@ -57,7 +57,7 @@ public:
 	{
 		int rdInt = 0;
 
-		if ( stream != NULL )
+		if (( stream != NULL ) && (position + 4 < stream->size()))
 		{
 			stream->seek( position );
 			stream->read( (unsigned char*) &rdInt, sizeof( rdInt ) );
@@ -72,7 +72,7 @@ public:
 	{
 		int rdUInt = 0;
 
-		if ( stream != NULL )
+		if (( stream != NULL ) && (position + 4 < stream->size()))
 		{
 			stream->seek( position );
 			stream->read((unsigned char*) &rdUInt, sizeof( rdUInt ) );
@@ -87,7 +87,7 @@ public:
 	{
 		unsigned char rdByte = 0;
 
-		if ( this->stream != NULL )
+		if (( stream != NULL ) && (position + 1 < stream->size()))
 		{
 			stream->seek( position);
 			stream->read( (unsigned char*)&rdByte, sizeof( rdByte ) );
@@ -105,6 +105,11 @@ public:
 
 		if ( ( stream != NULL ) && ( count > 0 ) && isResultNeeded )
 		{
+			if (position + count > stream->size())
+			{
+				if (position > stream->size())	count = 0;
+				else							count = stream->size() - position;
+			}
 			rdBytes = new unsigned char[count];
 
 			if ( rdBytes != NULL )

ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp

@@ -179,7 +179,10 @@ namespace DocFileFormat
 		}
 
 		if (FIB->m_FibBase.fEncrypted)
+		{
+			Clear();
 			return AVS_ERROR_DRM;
+		}
 
 		// Get the streams
 		if (FIB->m_FibBase.fWhichTblStm)

ASCOfficeDocFile/DocDocxConverter/WordDocument.h

@@ -72,7 +72,8 @@ namespace DocFileFormat
 
 		inline int FindFileCharPos(int cp)
 		{
-			return m_PieceTable->FileCharacterPositions->find(cp)->second;
+			std::map<int, int>::iterator it = m_PieceTable->FileCharacterPositions->find(cp);
+			return (it != m_PieceTable->FileCharacterPositions->end()) ? it->second : -1;
 		}
 
 	private:

ASCOfficeDocFile/DocFormatTest/DocFormatTest.cpp

@@ -24,14 +24,14 @@ int _tmain(int argc, _TCHAR* argv[])
 	
 	HRESULT hRes = docFile.LoadFromFile( sSrcDoc, dstTempPath, NULL);
 	
-	if (hRes != S_OK)return 2;
-	
+	if (hRes == S_OK)
+	{
 		COfficeUtils oCOfficeUtils(NULL);
-	if (S_OK != oCOfficeUtils.CompressFileOrDirectory(dstTempPath.c_str(), sDstDocx, -1))
-        return 1;
+		hRes = oCOfficeUtils.CompressFileOrDirectory(dstTempPath.c_str(), sDstDocx, -1);
+	}
 	
 	FileSystem::Directory::DeleteDirectory(dstTempPath);
 
-	return 0;
+	return hRes;
 }
 

ASCOfficeDocFile/Win32/ASCOfficeDocFile2005.vcproj

@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8,00"
 	Name="ASCOfficeDocFile"
-	ProjectGUID="{da13d6d4-39b5-49db-b5d7-d1afdbb7c320}"
+	ProjectGUID="{DA13D6D4-39B5-49DB-B5D7-D1AFDBB7C320}"
 	RootNamespace="ASCOfficeDocFile"
 	Keyword="AtlProj"
 	>