polyspace: compute lineEnd in long long, split catch clauses

Author: Nussu06

lib/suppressions.cpp

@@ -886,7 +886,7 @@ std::list<SuppressionList::Suppression> polyspace::Parser::parse(const std::stri
             if (rangeValue > 0) {
                 suppr.type = SuppressionList::Type::block;
                 suppr.lineBegin = line;
-                suppr.lineEnd = (rangeValue > std::numeric_limits<int>::max() - line) ? std::numeric_limits<int>::max() : (line + rangeValue);
+                suppr.lineEnd = static_cast<int>(std::min<long long>(std::numeric_limits<int>::max(), static_cast<long long>(line) + rangeValue));
             }
             else if (polyspaceKind == polyspace::CommentKind::Regular)
                 suppr.type = SuppressionList::Type::unique;
@@ -922,7 +922,9 @@ int polyspace::Parser::parseRange(const std::string& comment, std::string::size_
         int ret = std::stoi(range);
         pos = endpos;
         return ret;
-    } catch (const std::invalid_argument &) {} catch (const std::out_of_range &) {}
+    } catch (const std::invalid_argument &) {
+    } catch (const std::out_of_range &) {
+    }
     return 0;
 }
 

test/testsuppressions.cpp

@@ -2407,6 +2407,12 @@ class TestSuppressions : public TestFixture {
             { "/* polyspace +2147483647 MISRA2012 : 2.7 */", 2 },
             { { "premium-misra-c-2012-2.7", 2, "", SuppressionList::Type::block, 2, std::numeric_limits<int>::max() } }
             );
+
+        testPolyspaceSuppression(
+            "", "--misra-c-2012",
+            { "/* polyspace +5 MISRA2012 : 2.7 */", -1 },
+            { { "premium-misra-c-2012-2.7", -1, "", SuppressionList::Type::block, -1, 4 } }
+            );
     }
 
     void polyspaceBlock() const {