fix crash in daca gcc-avr from intentional bad instantiation test (cppcheck-opensource#1994)

IOBYTE · danmar · commit 6d6bb31926bc · 2019-07-15T12:41:06.000+02:00
* fix crash in daca gcc-avr from intentional bad instantiation test

* fix cppcheck warning
diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
@@ -52,6 +52,9 @@ InternalError::InternalError(const Token *tok, const std::string &errorMsg, Type
     case LIMIT:
         id = "cppcheckLimit";
         break;
+    case INSTANTIATION:
+        id = "instantiationError";
+        break;
     }
 }
 
diff --git a/lib/errorlogger.h b/lib/errorlogger.h
@@ -54,7 +54,7 @@ namespace tinyxml2 {
 
 /** @brief Simple container to be thrown when internal error is detected. */
 struct InternalError {
-    enum Type {AST, SYNTAX, UNKNOWN_MACRO, INTERNAL, LIMIT};
+    enum Type {AST, SYNTAX, UNKNOWN_MACRO, INTERNAL, LIMIT, INSTANTIATION};
     InternalError(const Token *tok, const std::string &errorMsg, Type type = INTERNAL);
     const Token *token;
     std::string errorMessage;
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
@@ -2180,7 +2180,7 @@ bool TemplateSimplifier::simplifyNumericCalculations(Token *tok)
 
         // Don't simplify "%num% / 0"
         if (Token::Match(op, "[/%] 0"))
-            break;
+            throw InternalError(op, "Instantiation error: Divide by zero in template instantiation.", InternalError::INSTANTIATION);
 
         // Integer operations
         if (Token::Match(op, ">>|<<|&|^|%or%")) {
diff --git a/test/testsimplifytemplate.cpp b/test/testsimplifytemplate.cpp
@@ -162,6 +162,7 @@ class TestSimplifyTemplate : public TestFixture {
         TEST_CASE(template122); // #9147
         TEST_CASE(template123); // #9183
         TEST_CASE(template124); // #9197
+        TEST_CASE(template125);
         TEST_CASE(template_specialization_1);  // #7868 - template specialization template <typename T> struct S<C<T>> {..};
         TEST_CASE(template_specialization_2);  // #7868 - template specialization template <typename T> struct S<C<T>> {..};
         TEST_CASE(template_enum);  // #6299 Syntax error in complex enum declaration (including template)
@@ -2923,6 +2924,17 @@ class TestSimplifyTemplate : public TestFixture {
         ASSERT_EQUALS(exp, tok(code));
     }
 
+    void template125() {
+        ASSERT_THROW(tok("template<int M, int N>\n"
+                         "class GCD {\n"
+                         "public:\n"
+                         "  enum { val = (N == 0) ? M : GCD<N, M % N>::val };\n"
+                         "};\n"
+                         "int main() {\n"
+                         "  GCD< 1, 0 >::val;\n"
+                         "}"), InternalError);
+    }
+
     void template_specialization_1() {  // #7868 - template specialization template <typename T> struct S<C<T>> {..};
         const char code[] = "template <typename T> struct C {};\n"
                             "template <typename T> struct S {a};\n"

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,9 @@ InternalError::InternalError(const Token *tok, const std::string &errorMsg, Type`
`52`	`52`	`case LIMIT:`
`53`	`53`	`id = "cppcheckLimit";`
`54`	`54`	`break;`
	`55`	`+ case INSTANTIATION:`
	`56`	`+ id = "instantiationError";`
	`57`	`+ break;`
`55`	`58`	`}`
`56`	`59`	`}`
`57`	`60`