mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid infinite loops in dxf rendering

Browse Source 
Change-Id: Id2eb5540241f0792cde35c444fc2c0c5b7778353
This commit is contained in:
Caolán McNamara
2017-01-13 13:18:53 +00:00
parent cd8fdb46fd
commit 57779b5f3a
3 changed files with 17337 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17320
filter/qa/cppunit/data/dxf/pass/loop-1.dxf Normal file
View File

File diff suppressed because it is too large Load Diff

6
filter/source/graphicfilter/idxf/dxf2mtf.cxx
View File

@@ -680,6 +680,10 @@ void DXF2GDIMetaFile::DrawDimensionEntity(const DXFDimensionEntity & rE, const D
void DXF2GDIMetaFile::DrawEntities(const DXFEntities & rEntities, void DXF2GDIMetaFile::DrawEntities(const DXFEntities & rEntities,
const DXFTransform & rTransform) const DXFTransform & rTransform)
{ {
if (rEntities.mbBeingDrawn)
return;
rEntities.mbBeingDrawn = true;
sal_uLong nCount=0; sal_uLong nCount=0;
DXFTransform aET; DXFTransform aET;
const DXFTransform * pT; const DXFTransform * pT;
@@ -745,6 +749,8 @@ void DXF2GDIMetaFile::DrawEntities(const DXFEntities & rEntities,
pE=pE->pSucc; pE=pE->pSucc;
nCount++; nCount++;
} }
rEntities.mbBeingDrawn = false;
} }

25
filter/source/graphicfilter/idxf/dxfentrd.hxx
View File

@@ -511,10 +511,19 @@ class DXFEntities {
public: public:
DXFEntities(); DXFEntities()
~DXFEntities(); : pFirst(nullptr)
, mbBeingDrawn(false)
{
}
~DXFEntities()
{
Clear();
}
DXFBasicEntity * pFirst; // list of entities, READ ONLY! DXFBasicEntity * pFirst; // list of entities, READ ONLY!
mutable bool mbBeingDrawn; // guard for loop in entity parsing
void Read(DXFGroupReader & rDGR); void Read(DXFGroupReader & rDGR);
// read entities per rGDR of a DXF file until a // read entities per rGDR of a DXF file until a
@@ -525,18 +534,6 @@ public:
// deletes all entities // deletes all entities
}; };
inline DXFEntities::DXFEntities()
{
pFirst=nullptr;
}
inline DXFEntities::~DXFEntities()
{
Clear();
}
#endif #endif