OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0024931: Stack overflow when writing large shapes to XML

Browse Source 
Added QA command OCC24931 and test case bugs/fclasses/bug24931
This commit is contained in:
Roman Lygin
2014-05-29 16:08:40 +04:00
committed by apn
parent ff8178ef85
commit 70167e6982
5 changed files with 104 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/LDOM/LDOM_OSStream.cxx
View File

@@ -14,28 +14,31 @@
// commercial license or contractual agreement.
#include <LDOM_OSStream.hxx>
#include <NCollection_DefineAlloc.hxx>
#include <NCollection_IncAllocator.hxx>
#include <string.h>
#include <Standard.hxx>
#include <Standard_Integer.hxx>
// One element of sequence
/* Can only be allocated by the allocator and assumes it is IncAllocator, so
no destructor is required.
*/
class LDOM_StringElem
{
char* buf; // pointer on data string
int len; // quantity of really written data
LDOM_StringElem* next; // pointer on the next element of a sequence
LDOM_StringElem (int aLen)
DEFINE_NCOLLECTION_ALLOC
LDOM_StringElem (int aLen, const Handle_NCollection_BaseAllocator& theAlloc) :
buf (reinterpret_cast<char*> (theAlloc->Allocate (aLen))),
len (0),
next (0)
{
buf = new char[aLen];
len = 0;
next = 0;
}
~LDOM_StringElem ()
{
delete [] buf;
if (next) delete next;
}
friend class LDOM_SBuffer;
};
@@ -44,10 +47,11 @@ friend class LDOM_SBuffer;
//purpose :
//=======================================================================
LDOM_SBuffer::LDOM_SBuffer (const Standard_Integer theMaxBuf)
: myMaxBuf (theMaxBuf), myLength(0)
: myMaxBuf (theMaxBuf), myLength(0),
myAlloc (new NCollection_IncAllocator)
{
myFirstString = new LDOM_StringElem (theMaxBuf);
myCurString = myFirstString;
myFirstString = new (myAlloc) LDOM_StringElem (theMaxBuf, myAlloc);
myCurString = myFirstString;
}
//=======================================================================
@@ -56,7 +60,7 @@ LDOM_SBuffer::LDOM_SBuffer (const Standard_Integer theMaxBuf)
//=======================================================================
LDOM_SBuffer::~LDOM_SBuffer ()
{
if (myFirstString) delete myFirstString;
//no destruction is required as IncAllocator is used
}
//=======================================================================
@@ -65,11 +69,10 @@ LDOM_SBuffer::~LDOM_SBuffer ()
//=======================================================================
void LDOM_SBuffer::Clear ()
{
if (myFirstString->next) delete myFirstString->next;
myFirstString->next = 0;
myFirstString->len = 0;
myLength = 0;
myCurString = myFirstString;
myAlloc = new NCollection_IncAllocator;
myFirstString = new (myAlloc) LDOM_StringElem (myMaxBuf, myAlloc);
myLength = 0;
myCurString = myFirstString;
}
//=======================================================================
@@ -130,7 +133,7 @@ int LDOM_SBuffer::xsputn(const char* aStr, int n)
}
else if (freeLen <= 0)
{
LDOM_StringElem* aNextElem = new LDOM_StringElem(Max(aLen, myMaxBuf));
LDOM_StringElem* aNextElem = new (myAlloc) LDOM_StringElem(Max(aLen, myMaxBuf), myAlloc);
myCurString->next = aNextElem;
myCurString = aNextElem;
strncpy(myCurString->buf + myCurString->len, aStr, aLen);
@@ -142,7 +145,7 @@ int LDOM_SBuffer::xsputn(const char* aStr, int n)
myCurString->len += freeLen;
*(myCurString->buf + myCurString->len) = '\0';
aLen -= freeLen;
LDOM_StringElem* aNextElem = new LDOM_StringElem(Max(aLen, myMaxBuf));
LDOM_StringElem* aNextElem = new (myAlloc) LDOM_StringElem(Max(aLen, myMaxBuf), myAlloc);
myCurString->next = aNextElem;
myCurString = aNextElem;
strncpy(myCurString->buf + myCurString->len, aStr + freeLen, aLen);

3
src/LDOM/LDOM_OSStream.hxx
View File

@@ -32,6 +32,7 @@
// and current element of sequence,
// also it has methods for the sequence management.
#include <NCollection_BaseAllocator.hxx>
#include <Standard_OStream.hxx>
#include <Standard_Boolean.hxx>
@@ -74,10 +75,12 @@ class LDOM_SBuffer : public streambuf
// Destructor
private:
Standard_Integer myMaxBuf; // default length of one element
Standard_Integer myLength; // full length of contained data
LDOM_StringElem* myFirstString; // the head of the sequence
LDOM_StringElem* myCurString; // current element of the sequence
Handle(NCollection_BaseAllocator) myAlloc; //allocator for chunks
};
class LDOM_OSStream : public Standard_OStream