From: sbh <sergey.belash@opencascade.com>
Date: Wed, 14 Jan 2015 08:20:55 +0000 (+0300)
Subject: Issue #329: avoid app crashes on malformed python feature launching
X-Git-Tag: V_1.0.0~40
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d774c495de208d4bb513db9f6211bc6d62ec2347;p=modules%2Fshaper.git

Issue #329: avoid app crashes on malformed python feature launching
---

diff --git a/src/Config/Config_ModuleReader.cpp b/src/Config/Config_ModuleReader.cpp
index d0da80ba0..526b9965f 100644
--- a/src/Config/Config_ModuleReader.cpp
+++ b/src/Config/Config_ModuleReader.cpp
@@ -173,18 +173,21 @@ void Config_ModuleReader::loadScript(const std::string theFileName)
 {
   /* aquire python thread */
   PyGILState_STATE gstate = PyGILState_Ensure();
-  PyObject* module = PyImport_ImportModule(theFileName.c_str());
 
+  PyObject* module = PyImport_ImportModule(theFileName.c_str());
   if (!module) {
     std::string anErrorMsg = "An error occured while importing " + theFileName;
     //Get detailed error message:
     if (PyErr_Occurred()) {
-      PyObject *ptype, *pvalue, *ptraceback;
+      PyObject *pstr, *ptype, *pvalue, *ptraceback;
       PyErr_Fetch(&ptype, &pvalue, &ptraceback);
-      std::string aPyError = std::string(PyString_AsString(pvalue));
+      PyErr_NormalizeException(&ptype, &pvalue, &ptraceback);
+      pstr = PyObject_Str(pvalue);
+      std::string aPyError = std::string(PyString_AsString(pstr));
       if (!aPyError.empty()) {
         anErrorMsg += ":\n" + aPyError;
       }
+      Py_XDECREF(pstr);
       Py_XDECREF(ptype);
       Py_XDECREF(pvalue);
       Py_XDECREF(ptraceback);