Fix a crash when the function signature provided by add-function tag does not

have parenteses.

Reviewed by Marcelo Lira <marcelo.lira@openbossa.org>

3 files changed, 25 insertions, 11 deletions

diff --git a/tests/testaddfunction.cpp b/tests/testaddfunction.cpp
index 0637eb5c9..d02fc67e1 100644
--- a/tests/testaddfunction.cpp
+++ b/tests/testaddfunction.cpp
@@ -144,6 +144,14 @@ void TestAddFunction::testAddFunctionCodeSnippets()
     QVERIFY(addedFunc->hasInjectedCode());
 }
 
+void TestAddFunction::testFunctionWithoutParenteses()
+{
+    const char sig1[] = "func";
+    AddedFunction f1(sig1, "void");
+    QCOMPARE(f1.name(), QString("func"));
+    QCOMPARE(f1.arguments().count(), 0);
+    QCOMPARE(f1.isConstant(), false);
+}
 
 QTEST_APPLESS_MAIN(TestAddFunction)
 
diff --git a/tests/testaddfunction.h b/tests/testaddfunction.h
index 45a562d4b..a8082a4b5 100644
--- a/tests/testaddfunction.h
+++ b/tests/testaddfunction.h
@@ -33,6 +33,7 @@ private slots:
     void testAddFunction();
     void testAddFunctionTagDefaultValues();
     void testAddFunctionCodeSnippets();
+    void testFunctionWithoutParenteses();
 };
 
 #endif
\ No newline at end of file
diff --git a/typesystem.cpp b/typesystem.cpp
index 1046aed6d..6d9cbe918 100644
--- a/typesystem.cpp
+++ b/typesystem.cpp
@@ -2109,18 +2109,23 @@ AddedFunction::AddedFunction(QString signature, QString returnType) : m_access(P
     m_returnType = parseType(returnType);
     signature = signature.trimmed();
     int endPos = signature.indexOf('(');
-    m_name = signature.left(endPos).trimmed();
-    int signatureLength = signature.length();
-    while (endPos < signatureLength) {
-        TypeInfo arg = parseType(signature, endPos, &endPos);
-        if (!arg.name.isEmpty())
-            m_arguments.append(arg);
-        // end of parameters...
-        if (signature[endPos] == ')')
-            break;
+    if (endPos < 0) {
+        m_isConst = false;
+        m_name = signature;
+    } else {
+        m_name = signature.left(endPos).trimmed();
+        int signatureLength = signature.length();
+        while (endPos < signatureLength) {
+            TypeInfo arg = parseType(signature, endPos, &endPos);
+            if (!arg.name.isEmpty())
+                m_arguments.append(arg);
+            // end of parameters...
+            if (signature[endPos] == ')')
+                break;
+        }
+        // is const?
+        m_isConst = signature.right(signatureLength - endPos).contains("const");
     }
-    // is const?
-    m_isConst = signature.right(signatureLength - endPos).contains("const");
 }
 
 /*