fix in Array getData and getDataCopy for segmentation fault

OpenModelica · Aug 10, 2015 · a0f0122 · a0f0122
1 parent a037dd8
commit a0f0122
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/SimulationRuntime/cpp/Include/Core/Math/Array.h b/SimulationRuntime/cpp/Include/Core/Math/Array.h
@@ -726,15 +726,22 @@ class StatArray : public BaseArray<T>
    */
   virtual T* getData()
   {
-    return _data;
+     if (external)
+      return _data;
+    else
+      return _array.c_array();
+
   }
 
   /**
    * Access to data (read-only)
    */
   virtual const T* getData() const
   {
-    return _data;
+   if (external)
+      return _data;
+    else
+      return _array.data();
   }
 
   /**
@@ -745,7 +752,11 @@ class StatArray : public BaseArray<T>
   {
     if(n>0)
 	{
-		std::copy(_data, _data + n, data);
+		 if (external)
+      std::copy(_data, _data + n, data);
+    else
+      std::copy(_array.begin(), _array.begin() + n, data);
+
 	}
   }