Added additional checks of inputed GUID string, now if the string is not valid GUID...

diff --git a/src/SALOMEDS/SALOMEDS_AttributeTreeNode.cxx b/src/SALOMEDS/SALOMEDS_AttributeTreeNode.cxx
index 59703419d340b5e6e7565f6ccaf81dc4812fe743..8cac2063ed264590ed04cf53d35d23993a0ba357 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_AttributeTreeNode.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeTreeNode.cxx
@@ -25,6 +25,7 @@
 #include "SALOMEDS.hxx"
 
 #include <string>
+#include <stdexcept>
 
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
@@ -248,6 +249,8 @@ _PTR(AttributeTreeNode) SALOMEDS_AttributeTreeNode::GetFirst()
 
 void SALOMEDS_AttributeTreeNode::SetTreeID(const std::string& value)
 {
+  if(!Standard_GUID::CheckGUIDFormat((char*)value.c_str())) throw invalid_argument("Invalid GUID");
+
   if (_isLocal) {
     CheckLocked();
     SALOMEDS::Locker lock;

diff --git a/src/SALOMEDS/SALOMEDS_AttributeUserID.cxx b/src/SALOMEDS/SALOMEDS_AttributeUserID.cxx
index 1b73e3c5c127ea48f96776ff89ff55a572856dec..c20087a4721508c3944267a4385219671cdbaaad 100644 (file)
--- a/src/SALOMEDS/SALOMEDS_AttributeUserID.cxx
+++ b/src/SALOMEDS/SALOMEDS_AttributeUserID.cxx
@@ -25,6 +25,8 @@
 #include "SALOMEDS.hxx"
 
 #include <string>
+#include <stdexcept>
+
 #include <TCollection_AsciiString.hxx> 
 #include <TCollection_ExtendedString.hxx>
 #include <Standard_GUID.hxx>
@@ -55,6 +57,8 @@ std::string SALOMEDS_AttributeUserID::Value()
 
 void SALOMEDS_AttributeUserID::SetValue(const std::string& value)
 {
+  if(!Standard_GUID::CheckGUIDFormat((char*)value.c_str())) throw invalid_argument("Invalid GUID");
+
   if (_isLocal) {
     CheckLocked();
     SALOMEDS::Locker lock;