Merge from V6_main_20120808 08Aug12

[modules/yacs.git] / src / runtime / PythonPorts.cxx

diff --git a/src/runtime/PythonPorts.cxx b/src/runtime/PythonPorts.cxx
index 069ee3b2ed021904860799870ac1eceecf438417..66e176e277a4c1b68d08521a7d29d12b9f6fae9c 100644 (file)
--- a/src/runtime/PythonPorts.cxx
+++ b/src/runtime/PythonPorts.cxx
@@ -1,21 +1,22 @@
-//  Copyright (C) 2006-2008  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2012  CEA/DEN, EDF R&D
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "PythonPorts.hxx"
 #include "TypeConversions.hxx"
 #include "TypeCode.hxx"
@@ -173,14 +174,20 @@ PyObject * InputPyPort::getPyObj() const
   return _data;
 }
 
-void *InputPyPort::get() const throw(Exception)
+void *InputPyPort::get() const throw(YACS::Exception)
 {
   return (void*) _data;
 }
 
 std::string InputPyPort::getAsString()
 {
-  return convertPyObjectToString(_data);
+  std::string ret;
+  //protect _data against modification or delete in another thread
+  PyObject* data=_data;
+  Py_INCREF(data);
+  ret = convertPyObjectToString(data);
+  Py_XDECREF(data);
+  return ret;
 }
 
 bool InputPyPort::isEmpty()
@@ -314,7 +321,13 @@ PyObject * OutputPyPort::getPyObj() const
 
 std::string OutputPyPort::getAsString()
 {
-  return convertPyObjectToString(_data);
+  std::string ret;
+  //protect _data against modification or delete in another thread
+  PyObject* data=_data;
+  Py_INCREF(data); 
+  ret = convertPyObjectToString(data);
+  Py_XDECREF(data); 
+  return ret;
 }
 
 std::string OutputPyPort::dump()