Fixed some static analysis warnings

partial backport of musescore#8762
Jojo-Schmitz · Aug 2, 2021 · ac8394c · ac8394c
1 parent 740b161
commit ac8394c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/importexport/guitarpro/importgtp-gp6.cpp b/importexport/guitarpro/importgtp-gp6.cpp
@@ -2505,8 +2505,8 @@ void GuitarPro6::readGpif(QByteArray* data)
                         legatos[slur->track()] = 0;
                         }
                   else {
-                        delete slur;
                         legatos[slur->track()] = 0;
+                        delete slur;
                         }
                   }
             }

diff --git a/libmscore/scorediff.cpp b/libmscore/scorediff.cpp
@@ -423,7 +423,7 @@ int MscxModeDiff::performShiftDiff(std::vector<TextDiff>& diffs, int index, int
 
 QString MscxModeDiff::getOuterLines(const QString& str, int lines, bool start) {
       lines = qAbs(lines);
-      const int secIdxStart = start ? 0 : (-1 - (lines - 1));
+      const int secIdxStart = start ? 0 : -lines;
       const int secIdxEnd = start ? (lines - 1) : -1;
       constexpr auto secFlags = QString::SectionIncludeTrailingSep | QString::SectionSkipEmpty;
       return str.section('\n', secIdxStart, secIdxEnd, secFlags);

diff --git a/thirdparty/intervaltree/IntervalTree.h b/thirdparty/intervaltree/IntervalTree.h
@@ -65,7 +65,7 @@ class IntervalTree {
         center = other.center;
         intervals = other.intervals;
         if (other.left) {
-            left = (intervalTree*) malloc(sizeof(intervalTree));
+            left = new intervalTree();
             *left = *other.left;
         } else {
             left = NULL;