Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions src/lib/parser-json-sarif.cc
Original file line number Diff line number Diff line change
Expand Up @@ -270,25 +270,28 @@ static void sarifReadCodeFlow(Defect *pDef, const pt::ptree &cf)
for (const auto &item : *locs) {
const pt::ptree &tfLoc = item.second;

const pt::ptree *kindList;
if (!findChildOf(&kindList, tfLoc, "kinds") || kindList->empty())
// kind of the event not specified
continue;

// concatenate event name
std::string evtName;
for (const auto &kindItem : *kindList) {
const pt::ptree &kind = kindItem.second;
if (!evtName.empty())
evtName += "_";
evtName += kind.data();
const pt::ptree *kindList;
if (findChildOf(&kindList, tfLoc, "kinds")) {
// calculate event name from the `kinds` list
for (const auto &kindItem : *kindList) {
const pt::ptree &kind = kindItem.second;
if (!evtName.empty())
evtName += "_";
evtName += kind.data();
}
}

// append a new event of the specified kind
events.push_back(DefEvent(evtName));
DefEvent &evt = events.back();

evt.verbosityLevel = valueOf<int>(tfLoc, "nestingLevel", 1);
// read/infer verbosity level
evt.verbosityLevel = valueOf<int>(tfLoc, "nestingLevel",
(evt.event.empty())
? /* trace */ 2
: /* info */ 1);

if (!evt.verbosityLevel)
// update key event
keyEventIdx = events.size() - 1U;
Expand All @@ -300,6 +303,13 @@ static void sarifReadCodeFlow(Defect *pDef, const pt::ptree &cf)

sarifReadLocation(&evt, *loc);
sarifReadMsg(&evt.msg, *loc);

if (evt.event.empty()) {
// if no `kind` is given, assume a generic trace event
evt.event = "path";
if (evt.msg.empty())
evt.msg = "generic trace event";
}
}

if (events.size() <= 1U)
Expand Down
Loading