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

.

Browse Source
This commit is contained in:
ElenaSubbotina
2016-04-21 14:40:03 +03:00
committed by Alexander Trofimov
parent 4af8d39695
commit 3590487f9c
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
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 ) );
@ -102,7 +102,7 @@ public:
{
unsigned char *rdBytes = NULL;
if ( ( stream != NULL ) && ( count > 0 ) && isResultNeeded )
if ( ( stream != NULL ) && ( count > 0 ))
{
rdBytes = new unsigned char[count];
@ -114,10 +114,6 @@ public:
position += sizeof( unsigned char )*count;
}
}
else
{
position += sizeof( unsigned char )*count;
}
return rdBytes;
}
@ -225,7 +221,6 @@ public:
private:
POLE::uint64 position;
//std::streampos position;
POLE::uint64 position;
POLE::Stream* stream;
};