pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-20 03:08:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

x2t - fix bug #46434

Browse Source
This commit is contained in:
ElenaSubbotina
2020-09-02 21:35:25 +03:00
parent da1f604f09
commit e53ba81da3
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Common/OfficeFileFormatChecker2.cpp
View File

@ -55,13 +55,13 @@ bool COfficeFileFormatChecker::isRtfFormatFile(unsigned char* pBuffer,int dwByte
}
bool COfficeFileFormatChecker::isHtmlFormatFile(unsigned char* pBuffer, int dwBytes, bool testCloseTag)
{
if (pBuffer == NULL) return false;
if (pBuffer == NULL || dwBytes < 4) return false;
bool tagOpen = false;
bool tagOpen = false;
if (testCloseTag)
if (testCloseTag && dwBytes > 5)
{
for (int i = 0; i < dwBytes - 6 ; i++)
for (int i = 0; i < dwBytes - 6; i++)
{
if ((0x3C == pBuffer[i]) && (0x2F == pBuffer[i +1]) && (0x48 == pBuffer[i + 2] || 0x68 == pBuffer[i + 2])
&& (0x54 == pBuffer[i + 3] || 0x74 == pBuffer[i + 3])
@ -72,7 +72,7 @@ bool COfficeFileFormatChecker::isHtmlFormatFile(unsigned char* pBuffer, int dwBy
}
}
}
else
else if (dwBytes > 3)
{
for (int i = 0; i < dwBytes - 4 && i < 100; i++)
{
@ -155,6 +155,8 @@ bool COfficeFileFormatChecker::isDocFormatFile (POLE::Storage * storage)
POLE::Stream stream(storage, L"WordDocument");
unsigned char buffer[64];
memset(buffer, 0, 64);
if (stream.read(buffer, 64) > 0)
{
//ms office 2007 encrypted contains stream WordDocument !!
@ -220,7 +222,7 @@ bool COfficeFileFormatChecker::isXlsFormatFile (POLE::Storage * storage)
}
bool COfficeFileFormatChecker::isDocFlatFormatFile (unsigned char* pBuffer, int dwBytes)
{
if (pBuffer == NULL) return false;
if (pBuffer == NULL || dwBytes < 2) return false;
if ((pBuffer[0] == 0xEC && pBuffer[1] == 0xA5) ||
(pBuffer[0] == 0xDC && pBuffer[1] == 0xA5) ||
@ -406,31 +408,31 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring & _fileName)
file.ReadFile(buffer, MIN_SIZE_BUFFER, dwReadBytes);
int sizeRead = (int)dwReadBytes;
if ( isRtfFormatFile(buffer,sizeRead) )
if ( isRtfFormatFile(buffer,sizeRead) ) // min size - 5
{
nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_RTF;
}
else if ( isBinaryDoctFormatFile(buffer,sizeRead) )
else if ( isBinaryDoctFormatFile(buffer,sizeRead) ) // min size - 4
{
nFileType = AVS_OFFICESTUDIO_FILE_CANVAS_WORD;
}
else if ( isBinaryXlstFormatFile(buffer,sizeRead) )
else if ( isBinaryXlstFormatFile(buffer,sizeRead) )// min size - 4
{
nFileType = AVS_OFFICESTUDIO_FILE_CANVAS_SPREADSHEET;
}
else if ( isBinaryPpttFormatFile(buffer,sizeRead) )
else if ( isBinaryPpttFormatFile(buffer,sizeRead) )// min size - 4
{
nFileType = AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION;
}
else if (isPdfFormatFile(buffer,sizeRead, sDocumentID) )
else if (isPdfFormatFile(buffer,sizeRead, sDocumentID) )// min size - 5
{
nFileType = AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF;
}
else if (isDjvuFormatFile(buffer,sizeRead) )
else if (isDjvuFormatFile(buffer,sizeRead) )// min size - 8
{
nFileType = AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_DJVU;
}
else if (isHtmlFormatFile(buffer,sizeRead, false))
else if (isHtmlFormatFile(buffer,sizeRead, false))// min size - 4
{
long fileSize = file.GetFileSize();
if (fileSize > MIN_SIZE_BUFFER)
@ -439,20 +441,20 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring & _fileName)
file.ReadFile(buffer, MIN_SIZE_BUFFER, dwReadBytes);
int sizeRead = (int)dwReadBytes;
}
if (isHtmlFormatFile(buffer,sizeRead, true))
if (isHtmlFormatFile(buffer,sizeRead, true))// min size - 6
{
nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML;
}
}
else if (isFB2FormatFile(buffer,sizeRead) )
else if (isFB2FormatFile(buffer,sizeRead) )// min size - 11
{
nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_FB2;
}
else if (isOpenOfficeFlatFormatFile(buffer,sizeRead) )
else if (isOpenOfficeFlatFormatFile(buffer,sizeRead) )// min size - 78
{
//nFileType
}
else if (isDocFlatFormatFile(buffer,sizeRead) )
else if (isDocFlatFormatFile(buffer,sizeRead) )// min size - 2
{
nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_DOC_FLAT; // without compaund container
}
@ -743,6 +745,8 @@ bool COfficeFileFormatChecker::isOpenOfficeFormatFile(const std::wstring & fileN
bool COfficeFileFormatChecker::isOpenOfficeFlatFormatFile(unsigned char* pBuffer,int dwBytes)
{
if (dwBytes < 78) return false;
const char *odfFormatLine = "office:document xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\"";
std::string xml_string((char*)pBuffer, dwBytes);
@ -980,7 +984,7 @@ bool COfficeFileFormatChecker::isMobiFormatFile(unsigned char* pBuffer,int dwByt
}
bool COfficeFileFormatChecker::isFB2FormatFile(unsigned char* pBuffer,int dwBytes)
{
if (pBuffer == NULL) return false;
if (pBuffer == NULL || dwBytes < 11) return false;
bool tagOpen = false;
//FB2 File is XML-file with rootElement - FictionBook