Skip to content

Commit f97bd02

Browse files
committed
Fixing Address sanitizer issues
1 parent 58d1690 commit f97bd02

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ if (ENABLE_ASAN)
253253
if (MSVC)
254254
message(STATUS "ASAN aktiviert für RelWithDebInfo")
255255
target_compile_options(MvrGdtf PRIVATE /fsanitize=address)
256-
target_compile_options(MvrGdtf PRIVATE /MTd)
256+
257257
endif()
258258
endif()
259259

src/GSString.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ TXString::TXString(wchar_t w, size_t count /* 1 */)
354354
// Destructor
355355
TXString::~TXString()
356356
{
357-
if (charPtr) delete charPtr;
357+
if (charPtr) ::operator delete(charPtr);
358358
}
359359

360360

src/Implementation/CSceneObjImpl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1875,7 +1875,7 @@ VectorworksMVR::VCOMError VectorworksMVR::CSceneObjImpl::AddMapping(MvrUUID mapD
18751875
// A fixture can't have 2 mappings with the same linked mappingDef
18761876
for(SceneData::SceneDataMappingObjPtr mapping : fixture->GetMappingsArray())
18771877
{
1878-
if(mapping->GetLinkedDefUuid() == newMappingUuid) { return kVCOMError_InvalidArg; }
1878+
if(mapping->GetLinkedDefUuid().GetUuidObj() == newMappingUuid.GetUuidObj() ) { return kVCOMError_InvalidArg; }
18791879
}
18801880

18811881
fixture->AddMapping(newMappingUuid);

src/SceneDataExchange.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1849,7 +1849,7 @@ size_t SceneDataDmxAdress::GetUniverse() const
18491849
// SceneDataProtocols
18501850
SceneDataProtocols::SceneDataProtocols( const TXString& geometry, const TXString& name, const TXString& type, const TXString& version, const ETransmissionType& transmision )
18511851
{
1852-
fGeometry = geometry.IsEmpty() ? "NetworkInOut_1" : geometry;
1852+
fGeometry = geometry.IsEmpty() ? TXString("NetworkInOut_1") : geometry;
18531853
fName = name;
18541854
fType = type;
18551855
fVersion = version;
@@ -4080,7 +4080,7 @@ void SceneDataExchange::ReadChildObjs(const IXMLFileNodePtr& node, SceneDataGrou
40804080
SceneDataGUID guid = SceneDataGUID(groupUuid);
40814081
for(SceneDataObjWithMatrixPtr sceneObject : fSceneObjects)
40824082
{
4083-
if(sceneObject->getGuid() == guid)
4083+
if(sceneObject->getGuid().GetUuidObj() == guid.GetUuidObj() )
40844084
{
40854085
fDuplicatedUuids = true;
40864086
DSTOP((kEveryone, "Some scene object's UUID is duplicated"));

0 commit comments

Comments
 (0)