Merge pull request diffblue#142 from NathanJPhillips/feature/dont-ignore-config-errors

Abort on most config files errors

Author: NathanJPhillips

src/goto-analyzer/taint_rules.cpp

@@ -235,8 +235,8 @@ std::unique_ptr<taint_rulest> taint_rulest::load(
     {
       msg.error()
         << "Rule in taint configuration file was a "
-        << rule_json << " instead of an object, ignoring it." << messaget::eom;
-      continue;
+        << rule_json << " instead of an object, aborting load." << messaget::eom;
+      return nullptr;
     }
 
     const std::string comment = rule_json["comment"].value,
@@ -249,25 +249,25 @@ std::unique_ptr<taint_rulest> taint_rulest::load(
       if(!method_name.empty())
       {
         msg.error()
-          << "Rule in taint configuration file contains method name attribute and also sets constructor to true, ignoring it"
+          << "Rule in taint configuration file contains method name attribute and also sets constructor to true, aborting load."
           << messaget::eom;
-        continue;
+        return nullptr;
       }
       method_name = "<init>";
     }
     if(class_name.empty())
     {
       msg.error()
-        << "Rule in taint configuration file does not contain class attribute, ignoring it"
+        << "Rule in taint configuration file does not contain class attribute, aborting load."
         << messaget::eom;
-      continue;
+      return nullptr;
     }
     if(method_name.empty())
     {
       msg.error()
-        << "Rule in taint configuration file does not contain method attribute, ignoring it"
+        << "Rule in taint configuration file does not contain method attribute, aborting load."
         << messaget::eom;
-      continue;
+      return nullptr;
     }
     method_name = class_name + "." + method_name;
     auto fn_details = fn_details_map.equal_range(method_name);
@@ -276,9 +276,9 @@ std::unique_ptr<taint_rulest> taint_rulest::load(
       msg.error()
         << "Rule in taint configuration file refers to "
         << method_name
-        << ": a method that we could not find in the goto program, ignoring it"
+        << ": a method that we could not find in the goto program, aborting load."
         << messaget::eom;
-      continue;
+      return nullptr;
     }
 
     // Load all the possible locations from JSON
@@ -349,8 +349,9 @@ std::unique_ptr<taint_rulest> taint_rulest::load(
     }
     else
       msg.error()
-        << "Rule has neither result nor sinkTarget, ignoring it."
+        << "Rule has neither result nor sinkTarget, aborting load."
         << messaget::eom;
+      return nullptr;
   }
 
   return rules->is_empty() ? nullptr : move(rules);