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

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

Browse Source
This commit is contained in:
ElenaSubbotina
2016-05-03 15:18:07 +03:00
committed by Alexander Trofimov
parent 9db24f8e66
commit e5f9ea5091
19 changed files with 89 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ASCOfficeDocFile/DocDocxConverter/VirtualStreamReader.h
View File

@ -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 )