Bugfix

Author: Michal Startek

src/IsoSpec++/fixedEnvelopes.cpp

@@ -23,9 +23,9 @@ namespace IsoSpec
 {
 
 FixedEnvelope::FixedEnvelope(const FixedEnvelope& other) :
-_masses(array_copy<double>(other._masses, other._confs_no)),
-_probs(array_copy<double>(other._probs, other._confs_no)),
-_confs(array_copy_nptr<int>(other._confs, other._confs_no*other.allDim)),
+_masses(array_copy_malloc<double>(other._masses, other._confs_no)),
+_probs(array_copy_malloc<double>(other._probs, other._confs_no)),
+_confs(array_copy_nptr_malloc<int>(other._confs, other._confs_no*other.allDim)),
 _confs_no(other._confs_no),
 allDim(other.allDim),
 sorted_by_mass(other.sorted_by_mass),

src/IsoSpec++/misc.h

@@ -128,13 +128,31 @@ template <typename T> inline static T* array_copy(const T* A, size_t size)
     return ret;
 }
 
+template <typename T> inline static T* array_copy_malloc(const T* A, size_t size)
+{
+    T* ret = reinterpret_cast<T*>(malloc(size * sizeof(T)));
+    if(ret == nullptr)
+        throw std::bad_alloc();
+    memcpy(ret, A, size*sizeof(T));
+    return ret;
+}
+
+
 template <typename T> static T* array_copy_nptr(const T* A, size_t size)
 {
     if(A == nullptr)
         return nullptr;
     return array_copy(A, size);
 }
 
+template <typename T> static T* array_copy_nptr_malloc(const T* A, size_t size)
+{
+    if(A == nullptr)
+        return nullptr;
+    return array_copy_malloc(A, size);
+}
+
+
 template<typename T> void dealloc_table(T* tbl, int dim)
 {
     for(int i = 0; i < dim; i++)