From f97bd0280035d14c728c22045ba2dcc0971b5962 Mon Sep 17 00:00:00 2001
From: Alesandro Dragnev <adragnev@vectorworks.net>
Date: Wed, 18 Mar 2026 16:40:22 +0200
Subject: [PATCH 1/2] Fixing Address sanitizer issues

---
 CMakeLists.txt                       | 2 +-
 src/GSString.cpp                     | 2 +-
 src/Implementation/CSceneObjImpl.cpp | 2 +-
 src/SceneDataExchange.cpp            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 957e7a08..2b38c27b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -253,7 +253,7 @@ if (ENABLE_ASAN)
     if (MSVC)
         message(STATUS "ASAN aktiviert für RelWithDebInfo")
         target_compile_options(MvrGdtf PRIVATE /fsanitize=address)
-        target_compile_options(MvrGdtf PRIVATE /MTd)
+
     endif()
 endif()
 
diff --git a/src/GSString.cpp b/src/GSString.cpp
index 3400890c..feccfe64 100644
--- a/src/GSString.cpp
+++ b/src/GSString.cpp
@@ -354,7 +354,7 @@ TXString::TXString(wchar_t w, size_t count /* 1 */)
 // Destructor
 TXString::~TXString()
 {
-	if (charPtr) delete charPtr;
+	if (charPtr) ::operator delete(charPtr);
 }
 
 
diff --git a/src/Implementation/CSceneObjImpl.cpp b/src/Implementation/CSceneObjImpl.cpp
index ab3b14a1..1da2d4f1 100644
--- a/src/Implementation/CSceneObjImpl.cpp
+++ b/src/Implementation/CSceneObjImpl.cpp
@@ -1875,7 +1875,7 @@ VectorworksMVR::VCOMError VectorworksMVR::CSceneObjImpl::AddMapping(MvrUUID mapD
 	// A fixture can't have 2 mappings with the same linked mappingDef
 	for(SceneData::SceneDataMappingObjPtr mapping : fixture->GetMappingsArray())
 	{
-		if(mapping->GetLinkedDefUuid() == newMappingUuid) { return kVCOMError_InvalidArg; }
+		if(mapping->GetLinkedDefUuid().GetUuidObj() == newMappingUuid.GetUuidObj() ) { return kVCOMError_InvalidArg; }
 	}
 
 	fixture->AddMapping(newMappingUuid);
diff --git a/src/SceneDataExchange.cpp b/src/SceneDataExchange.cpp
index fcda952e..e43c59a0 100644
--- a/src/SceneDataExchange.cpp
+++ b/src/SceneDataExchange.cpp
@@ -1849,7 +1849,7 @@ size_t SceneDataDmxAdress::GetUniverse() const
 // SceneDataProtocols
 SceneDataProtocols::SceneDataProtocols( const TXString& geometry, const TXString& name, const TXString& type, const TXString& version, const ETransmissionType& transmision )
 {
-	fGeometry		= geometry.IsEmpty() ? "NetworkInOut_1" : geometry;
+	fGeometry		= geometry.IsEmpty() ? TXString("NetworkInOut_1") : geometry;
 	fName			= name;
 	fType			= type;
 	fVersion		= version;
@@ -4080,7 +4080,7 @@ void SceneDataExchange::ReadChildObjs(const IXMLFileNodePtr& node, SceneDataGrou
 						SceneDataGUID guid = SceneDataGUID(groupUuid);
 						for(SceneDataObjWithMatrixPtr sceneObject : fSceneObjects)
 						{
-							if(sceneObject->getGuid() == guid)
+							if(sceneObject->getGuid().GetUuidObj() == guid.GetUuidObj() )
 							{
 								fDuplicatedUuids = true;
 								DSTOP((kEveryone, "Some scene object's UUID is duplicated"));

From 7338960538902270ee63580e22e7d4e8bb78f36a Mon Sep 17 00:00:00 2001
From: Alesandro Dragnev <adragnev@vectorworks.net>
Date: Wed, 18 Mar 2026 16:49:09 +0200
Subject: [PATCH 2/2] Reverting CMake changes

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b38c27b..957e7a08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -253,7 +253,7 @@ if (ENABLE_ASAN)
     if (MSVC)
         message(STATUS "ASAN aktiviert für RelWithDebInfo")
         target_compile_options(MvrGdtf PRIVATE /fsanitize=address)
-
+        target_compile_options(MvrGdtf PRIVATE /MTd)
     endif()
 endif()