cwe-name-lookup: recognize "cwe_id", "names" as CSV header

... and insert the header into `cwe-names.csv`

Closes: #118

Author: kdudka

data/cwe-names.csv

@@ -1,3 +1,4 @@
+"cwe_id","name"
 "15","External Control of System or Configuration Setting"
 "19","Data Processing Errors"
 "20","Improper Input Validation"
@@ -306,7 +307,7 @@
 "663","Use of a Non-reentrant Function in a Concurrent Context"
 "664","Improper Control of a Resource Through its Lifetime"
 "665","Improper Initialization"
-"667", "Improper Locking"
+"667","Improper Locking"
 "670","Always-Incorrect Control Flow Implementation"
 "672","Operation on a Resource after Expiration or Release"
 "674","Uncontrolled Recursion"

src/lib/csv-parser.cc

@@ -53,7 +53,11 @@ bool AbstractCsvParser::parse(InStream &ins)
         // break the current line into fields
         const TStringList fields(tok.begin(), tok.end());
 
-        // call the template method
+        // call the template method for CSV header
+        if (1 == d->lineno && /* handled */this->handleHeader(fields))
+            continue;
+
+        // call the template method for CSV data
         if (!/* continue */this->handleLine(fields))
             break;
     }

src/lib/csv-parser.hh

@@ -39,6 +39,12 @@ class AbstractCsvParser {
     protected:
         using TStringList = std::vector<std::string>;
 
+        /// called for the first line only
+        virtual bool /* handled */ handleHeader(const TStringList &) {
+            // returning false causes handleLine() to be called as a fallback
+            return false;
+        }
+
         virtual bool /* continue */ handleLine(const TStringList &) = 0;
         void parseError(const std::string &msg);
 

src/lib/cwe-name-lookup.cc

@@ -36,6 +36,14 @@ CweNameLookup::CweNameLookup():
 
 CweNameLookup::~CweNameLookup() = default;
 
+bool CweNameLookup::handleHeader(const TStringList &fields)
+{
+    // "cwe_id", "name" is recognized as the CSV header for cwe-names.csv
+    return 2U == fields.size()
+        && "cwe_id" == fields[0]
+        && "name" == fields[1];
+}
+
 bool CweNameLookup::handleLine(const TStringList &fields)
 {
     if (2U != fields.size()) {

src/lib/cwe-name-lookup.hh

@@ -34,6 +34,7 @@ class CweNameLookup: public AbstractCsvParser {
         const std::string& lookup(int cwe) const;
 
     protected:
+        bool /* handled */ handleHeader(const TStringList &) override;
         bool /* continue */ handleLine(const TStringList &) override;
 
     private: