fix memory leak and crash on deleting measures

musescore · Aug 30, 2018 · 3598e95 · 3598e95
1 parent 209b5c7
commit 3598e95
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/audiofile/audiofile.cpp b/audiofile/audiofile.cpp
@@ -97,6 +97,8 @@ sf_count_t AudioFile::readData(short* data, sf_count_t frames)
             //convert normalized floats to signed short values
             for (int i = 0; i < totalFrames; ++i)
                   data[i] = adjScale * lrintf(dataF[i] * (dataF[i] > 0 ? SHRT_MAX : -SHRT_MIN));
+
+            delete[] dataF;
             }
 
       return resFrames;

diff --git a/libmscore/undo.cpp b/libmscore/undo.cpp
@@ -1616,8 +1616,8 @@ void InsertRemoveMeasures::removeMeasures()
                         }
                   auto i = std::find(system->measures().begin(), system->measures().end(), mb);
                   if (i != system->measures().end()) {
-                        system->measures().erase(i);
                         (*i)->setParent(0);
+                        system->measures().erase(i);
                         }
                   }
             if (mb == fm)