OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0026913: Vulnerable mechanism in Standard_Type leads to assert

Browse Source
This commit is contained in:
Roman Lygin 2015-11-22 14:54:39 +04:00 committed by bugmaster
parent 325e442bce
commit a0218ba1c5
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Standard/Standard_Type.cxx
View File

@ -23,6 +23,27 @@ IMPLEMENT_STANDARD_RTTIEXT(Standard_Type,Standard_Transient)
//============================================================================ //============================================================================
namespace {
static Standard_CString copy_string (const char* theString)
{
size_t aLength = strlen (theString);
char* aResult = static_cast<char*> (Standard::Allocate (aLength + 1));
strncpy (aResult, theString, aLength + 1); //including null-character
return aResult;
}
}
Standard_Type::Standard_Type (const char* theSystemName,
const char* theName,
Standard_Size theSize,
const Handle(Standard_Type)& theParent) :
mySystemName (copy_string (theSystemName)),
myName(theName), mySize(theSize), myParent(theParent)
{
}
//============================================================================
Standard_Boolean Standard_Type::SubType (const Handle(Standard_Type)& theOther) const Standard_Boolean Standard_Type::SubType (const Handle(Standard_Type)& theOther) const
{ {
return ! theOther.IsNull() && (theOther == this || (! myParent.IsNull() && myParent->SubType (theOther))); return ! theOther.IsNull() && (theOther == this || (! myParent.IsNull() && myParent->SubType (theOther)));
@ -91,7 +112,7 @@ Standard_Type* Standard_Type::Register (const char* theSystemName, const char* t
aType = new Standard_Type (theSystemName, theName, theSize, theParent); aType = new Standard_Type (theSystemName, theName, theSize, theParent);
// then add it to registry and return (the reference to the handle stored in the registry) // then add it to registry and return (the reference to the handle stored in the registry)
aRegistry.Bind (theSystemName, aType); aRegistry.Bind (aType->mySystemName, aType);
// cout << "Registering " << theSystemName << ": " << aRegistry.Extent() << endl; // cout << "Registering " << theSystemName << ": " << aRegistry.Extent() << endl;
@ -105,4 +126,5 @@ Standard_Type::~Standard_Type ()
Standard_ASSERT(aRegistry.UnBind (mySystemName), "Standard_Type::~Standard_Type() cannot find itself in registry",); Standard_ASSERT(aRegistry.UnBind (mySystemName), "Standard_Type::~Standard_Type() cannot find itself in registry",);
// cout << "Unregistering " << mySystemName << ": " << aRegistry.Extent() << endl; // cout << "Unregistering " << mySystemName << ": " << aRegistry.Extent() << endl;
Standard::Free (mySystemName);
} }

5
src/Standard/Standard_Type.hxx
View File

@ -143,10 +143,7 @@ private:
//! Constructor is private //! Constructor is private
Standard_Type (const char* theSystemName, const char* theName, Standard_Type (const char* theSystemName, const char* theName,
Standard_Size theSize, const Handle(Standard_Type)& theParent) Standard_Size theSize, const Handle(Standard_Type)& theParent);
: mySystemName(theSystemName), myName(theName), mySize(theSize), myParent(theParent)
{
}
private: private:
Standard_CString mySystemName; //!< System name of the class (typeinfo.name) Standard_CString mySystemName; //!< System name of the class (typeinfo.name)