Merge pull request #495 from geoffw0/returnvalue

CPP: Fix 'Missing return statement'

cpp/ql/src/jsf/4.13 Functions/AV Rule 114.ql

@@ -38,6 +38,8 @@ predicate functionImperfectlyExtracted(Function f) {
   exists(CompilerError e | f.getBlock().getLocation().subsumes(e.getLocation()))
   or
   exists(ErrorExpr ee | ee.getEnclosingFunction() = f)
+  or
+  count(f.getType()) > 1
 }
 
 from Stmt stmt, string msg, Function f, ControlFlowNode blame

cpp/ql/test/query-tests/jsf/4.13 Functions/AV Rule 114/test.c

@@ -84,3 +84,13 @@ int f12(int x)
         // ...
     }
 }
+
+void f13()
+{
+	f13_func(); // implicitly declared here
+}
+
+void f13_func(int x)
+{
+	if (x < 10) return; // GOOD
+}