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

DocFormatReader ...

Browse Source
This commit is contained in:
ElenaSubbotina
2016-04-20 10:55:35 +03:00
committed by Alexander Trofimov
parent 7b81367027
commit ecbb00a1b8
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp
View File

@ -1259,7 +1259,7 @@ namespace DocFileFormat
{
//it's a bitmap image
BitmapBlip* bitBlip = static_cast<BitmapBlip*>(RecordFactory::ReadRecord(&reader, 0));
if (bitBlip)
if ((bitBlip) && (bitBlip->m_pvBits))
{
m_ctx->_docx->ImagesList.push_back(ImageFileStructure(GetTargetExt(oBlip->btWin32),
vector<unsigned char>(bitBlip->m_pvBits, (bitBlip->m_pvBits + bitBlip->pvBitsSize)), oBlip->btWin32));

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