This is an archive of the discontinued LLVM Phabricator instance.

Differential D65209

[analyzer] Fix a SARIF exporter crash with macro expansions
ClosedPublic

Authored by jranieri-grammatech on Jul 24 2019, 7:02 AM.

Details

Reviewers
NoQ
george.karpenkov
aaron.ballman
Commits
rC370061: Fix a SARIF exporter crash with macro expansions
rG3385c5cc4dfd: Fix a SARIF exporter crash with macro expansions
rL370061: Fix a SARIF exporter crash with macro expansions

Diff Detail

Event Timeline

jranieri-grammatech created this revision.Jul 24 2019, 7:02 AM
Herald added a project: Restricted Project. · View Herald TranscriptJul 24 2019, 7:02 AM
Herald added subscribers: cfe-commits, Charusso, dkrupp and 7 others. · View Herald Transcript
jranieri-grammatech added a parent revision: D65206: [analyzer] Fix text range end columns in SARIF to be exclusive.Jul 24 2019, 7:02 AM
jranieri-grammatech added a child revision: D65211: [analyzer] Update the SARIF exporter to SARIF 2.1.Jul 24 2019, 7:06 AM
aaron.ballman accepted this revision.Jul 30 2019, 5:31 AM

This LGTM, but I'd appreciate a second reviewer chiming in only because Joe is a coworker.

This revision is now accepted and ready to land.Jul 30 2019, 5:31 AM
aaron.ballman added a comment.Aug 20 2019, 12:36 PM
In D65209#1606075, @aaron.ballman wrote:

This LGTM, but I'd appreciate a second reviewer chiming in only because Joe is a coworker.

Sufficient time has passed that any concerns other reviewers have can be addressed post-commit. Continues to LGTM.

Closed by commit rG3385c5cc4dfd: Fix a SARIF exporter crash with macro expansions (authored by jranieri-grammatech). · Explain WhyAug 27 2019, 7:23 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang/
lib/
StaticAnalyzer/
Core/
10 lines
test/
Analysis/
diagnostics/
Inputs/
expected-sarif/
155 lines
13 lines

Diff 217395

clang/lib/StaticAnalyzer/Core/SarifDiagnostics.cpp

Show First 20 Lines • Show All 213 Lines • ▼ Show 20 Lines
static json::Object createThreadFlow(const PathPieces &Pieces, static json::Object createThreadFlow(const PathPieces &Pieces,
json::Array &Files) { json::Array &Files) {
const SourceManager &SMgr = Pieces.front()->getLocation().getManager(); const SourceManager &SMgr = Pieces.front()->getLocation().getManager();
json::Array Locations; json::Array Locations;
for (const auto &Piece : Pieces) { for (const auto &Piece : Pieces) {
const PathDiagnosticLocation &P = Piece->getLocation(); const PathDiagnosticLocation &P = Piece->getLocation();
Locations.push_back(createThreadFlowLocation( Locations.push_back(createThreadFlowLocation(
createLocation(createPhysicalLocation(P.asRange(), createLocation(createPhysicalLocation(
*P.asLocation().getFileEntry(), P.asRange(),
*P.asLocation().getExpansionLoc().getFileEntry(),
SMgr, Files), SMgr, Files),
Piece->getString()), Piece->getString()),
calculateImportance(*Piece))); calculateImportance(*Piece)));
} }
return json::Object{{"locations", std::move(Locations)}}; return json::Object{{"locations", std::move(Locations)}};
} }
static json::Object createCodeFlow(const PathPieces &Pieces, static json::Object createCodeFlow(const PathPieces &Pieces,
json::Array &Files) { json::Array &Files) {
Show All 17 Linesstatic json::Object createResult(const PathDiagnostic &Diag, json::Array &Files,
assert(Iter != RuleMapping.end() && "Rule ID is not in the array index map?"); assert(Iter != RuleMapping.end() && "Rule ID is not in the array index map?");
return json::Object{ return json::Object{
{"message", createMessage(Diag.getVerboseDescription())}, {"message", createMessage(Diag.getVerboseDescription())},
{"codeFlows", json::Array{createCodeFlow(Path, Files)}}, {"codeFlows", json::Array{createCodeFlow(Path, Files)}},
{"locations", {"locations",
json::Array{createLocation(createPhysicalLocation( json::Array{createLocation(createPhysicalLocation(
Diag.getLocation().asRange(), Diag.getLocation().asRange(),
*Diag.getLocation().asLocation().getFileEntry(), SMgr, Files))}}, *Diag.getLocation().asLocation().getExpansionLoc().getFileEntry(),
SMgr, Files))}},
{"ruleIndex", Iter->getValue()}, {"ruleIndex", Iter->getValue()},
{"ruleId", Diag.getCheckName()}}; {"ruleId", Diag.getCheckName()}};
} }
static StringRef getRuleDescription(StringRef CheckName) { static StringRef getRuleDescription(StringRef CheckName) {
return llvm::StringSwitch<StringRef>(CheckName) return llvm::StringSwitch<StringRef>(CheckName)
#define GET_CHECKERS #define GET_CHECKERS
#define CHECKER(FULLNAME, CLASS, HELPTEXT, DOC_URI, IS_HIDDEN) \ #define CHECKER(FULLNAME, CLASS, HELPTEXT, DOC_URI, IS_HIDDEN) \
▲ Show 20 Lines • Show All 89 Lines • Show Last 20 Lines

clang/test/Analysis/diagnostics/Inputs/expected-sarif/sarif-multi-diagnostic-test.c.sarif

{ {
"$schema": "http://json.schemastore.org/sarif-2.0.0-csd.2.beta.2018-11-28", "$schema": "http://json.schemastore.org/sarif-2.0.0-csd.2.beta.2018-11-28",
"runs": [ "runs": [
{ {
"files": [ "files": [
{ {
"fileLocation": { "fileLocation": {
}, },
"length": 686, "length": 951,
"mimeType": "text/plain", "mimeType": "text/plain",
"roles": [ "roles": [
"resultFile" "resultFile"
] ]
} }
], ],
"resources": { "resources": {
"rules": [ "rules": [
Show All 20 Lines "runs": [
"fullDescription": { "fullDescription": {
"text": "Check for division by zero" "text": "Check for division by zero"
}, },
"helpUri": "https://clang-analyzer.llvm.org/available_checks.html#core.DivideZero", "helpUri": "https://clang-analyzer.llvm.org/available_checks.html#core.DivideZero",
"id": "core.DivideZero", "id": "core.DivideZero",
"name": { "name": {
"text": "core.DivideZero" "text": "core.DivideZero"
} }
},
{
"fullDescription": {
"text": "Check for memory leaks, double free, and use-after-free problems. Traces memory managed by malloc()/free()."
},
"helpUri": "https://clang-analyzer.llvm.org/available_checks.html#unix.Malloc",
"id": "unix.Malloc",
"name": {
"text": "unix.Malloc"
}
} }
] ]
}, },
"results": [ "results": [
{ {
"codeFlows": [ "codeFlows": [
{ {
"threadFlows": [ "threadFlows": [
{ {
"locations": [ "locations": [
{ {
"importance": "essential", "importance": "essential",
"location": { "location": {
"message": { "message": {
"text": "Calling 'f'" "text": "Calling 'f'"
}, },
"physicalLocation": { "physicalLocation": {
"fileLocation": { "fileLocation": {
"fileIndex": 0, "fileIndex": 0,
}, },
"region": { "region": {
"endColumn": 6, "endColumn": 6,
"endLine": 24, "endLine": 34,
"startColumn": 3, "startColumn": 3,
"startLine": 24 "startLine": 34
} }
} }
} }
}, },
{ {
"importance": "essential", "importance": "essential",
"location": { "location": {
"message": { "message": {
"text": "tainted" "text": "tainted"
}, },
"physicalLocation": { "physicalLocation": {
"fileLocation": { "fileLocation": {
"fileIndex": 0, "fileIndex": 0,
}, },
"region": { "region": {
"endColumn": 18, "endColumn": 18,
"endLine": 9, "endLine": 11,
"startColumn": 11, "startColumn": 11,
"startLine": 9 "startLine": 11
} }
} }
} }
} }
] ]
} }
] ]
} }
], ],
"locations": [ "locations": [
{ {
"physicalLocation": { "physicalLocation": {
"fileLocation": { "fileLocation": {
"fileIndex": 0, "fileIndex": 0,
}, },
"region": { "region": {
"endColumn": 18, "endColumn": 18,
"endLine": 9, "endLine": 11,
"startColumn": 11, "startColumn": 11,
"startLine": 9 "startLine": 11
} }
} }
} }
], ],
"message": { "message": {
"text": "tainted" "text": "tainted"
}, },
"ruleId": "debug.TaintTest", "ruleId": "debug.TaintTest",
Show All 12 Lines "runs": [
"text": "Calling 'g'" "text": "Calling 'g'"
}, },
"physicalLocation": { "physicalLocation": {
"fileLocation": { "fileLocation": {
"fileIndex": 0, "fileIndex": 0,
}, },
"region": { "region": {
"endColumn": 6, "endColumn": 6,
"endLine": 25, "endLine": 35,
"startColumn": 3, "startColumn": 3,
"startLine": 25 "startLine": 35
} }
} }
} }
}, },
{ {
"importance": "essential", "importance": "essential",
"location": { "location": {
"message": { "message": {
"text": "'fp' declared without an initial value" "text": "'fp' declared without an initial value"
}, },
"physicalLocation": { "physicalLocation": {
"fileLocation": { "fileLocation": {
"fileIndex": 0, "fileIndex": 0,
}, },
"region": { "region": {
"endColumn": 11, "endColumn": 11,
"endLine": 13, "endLine": 15,
"startColumn": 3, "startColumn": 3,
"startLine": 13 "startLine": 15
} }
} }
} }
}, },
{ {
"importance": "essential", "importance": "essential",
"location": { "location": {
"message": { "message": {
"text": "Called function pointer is an uninitialized pointer value" "text": "Called function pointer is an uninitialized pointer value"
}, },
"physicalLocation": { "physicalLocation": {
"fileLocation": { "fileLocation": {
"fileIndex": 0, "fileIndex": 0,
}, },
"region": { "region": {
"endColumn": 9, "endColumn": 9,
"endLine": 14, "endLine": 16,
"startColumn": 3, "startColumn": 3,
"startLine": 14 "startLine": 16
} }
} }
} }
} }
] ]
} }
] ]
} }
], ],
"locations": [ "locations": [
{ {
"physicalLocation": { "physicalLocation": {
"fileLocation": { "fileLocation": {
"fileIndex": 0, "fileIndex": 0,
}, },
"region": { "region": {
"endColumn": 9, "endColumn": 9,
"endLine": 14, "endLine": 16,
"startColumn": 3, "startColumn": 3,
"startLine": 14 "startLine": 16
} }
} }
} }
], ],
"message": { "message": {
"text": "Called function pointer is an uninitialized pointer value" "text": "Called function pointer is an uninitialized pointer value"
}, },
"ruleId": "core.CallAndMessage", "ruleId": "core.CallAndMessage",
Show All 12 Lines "runs": [
"text": "Assuming 'i' is equal to 0" "text": "Assuming 'i' is equal to 0"
}, },
"physicalLocation": { "physicalLocation": {
"fileLocation": { "fileLocation": {
"fileIndex": 0, "fileIndex": 0,
}, },
"region": { "region": {
"endColumn": 13, "endColumn": 13,
"endLine": 18, "endLine": 20,
"startColumn": 7, "startColumn": 7,
"startLine": 18 "startLine": 20
} }
} }
} }
}, },
{ {
"importance": "unimportant", "importance": "unimportant",
"location": { "location": {
"message": { "message": {
"text": "Taking true branch" "text": "Taking true branch"
}, },
"physicalLocation": { "physicalLocation": {
"fileLocation": { "fileLocation": {
"fileIndex": 0, "fileIndex": 0,
}, },
"region": { "region": {
"endColumn": 3, "endColumn": 3,
"startColumn": 3, "startColumn": 3,
"startLine": 18 "startLine": 20
} }
} }
} }
}, },
{ {
"importance": "essential", "importance": "essential",
"location": { "location": {
"message": { "message": {
"text": "Division by zero" "text": "Division by zero"
}, },
"physicalLocation": { "physicalLocation": {
"fileLocation": { "fileLocation": {
"fileIndex": 0, "fileIndex": 0,
}, },
"region": { "region": {
"endColumn": 14, "endColumn": 14,
"startColumn": 14, "startColumn": 14,
"startLine": 19 "startLine": 21
} }
} }
} }
} }
] ]
} }
] ]
} }
], ],
"locations": [ "locations": [
{ {
"physicalLocation": { "physicalLocation": {
"fileLocation": { "fileLocation": {
"fileIndex": 0, "fileIndex": 0,
}, },
"region": { "region": {
"endColumn": 14, "endColumn": 14,
"startColumn": 14, "startColumn": 14,
"startLine": 19 "startLine": 21
} }
} }
} }
], ],
"message": { "message": {
"text": "Division by zero" "text": "Division by zero"
}, },
"ruleId": "core.DivideZero", "ruleId": "core.DivideZero",
"ruleIndex": 2 "ruleIndex": 2
},
{
"codeFlows": [
{
"threadFlows": [
{
"locations": [
{
"importance": "essential",
"location": {
"message": {
"text": "Memory is allocated"
},
"physicalLocation": {
"fileLocation": {
"fileIndex": 0,
},
"region": {
"endColumn": 24,
"endLine": 26,
"startColumn": 15,
"startLine": 26
}
}
}
},
{
"importance": "important",
"location": {
"message": {
"text": "Assuming 'i' is < 4"
},
"physicalLocation": {
"fileLocation": {
"fileIndex": 0,
},
"region": {
"endColumn": 12,
"endLine": 27,
"startColumn": 7,
"startLine": 27
}
}
}
},
{
"importance": "unimportant",
"location": {
"message": {
"text": "Taking true branch"
},
"physicalLocation": {
"fileLocation": {
"fileIndex": 0,
},
"region": {
"endColumn": 3,
"startColumn": 3,
"startLine": 27
}
}
}
},
{
"importance": "essential",
"location": {
"message": {
"text": "Potential leak of memory pointed to by 'mem'"
},
"physicalLocation": {
"fileLocation": {
"fileIndex": 0,
},
"region": {
"endColumn": 12,
"startColumn": 12,
"startLine": 28
}
}
}
}
]
}
]
}
],
"locations": [
{
"physicalLocation": {
"fileLocation": {
"fileIndex": 0,
},
"region": {
"endColumn": 12,
"startColumn": 12,
"startLine": 28
}
}
}
],
"message": {
"text": "Potential leak of memory pointed to by 'mem'"
},
"ruleId": "unix.Malloc",
"ruleIndex": 3
} }
], ],
"tool": { "tool": {
"fullName": "clang static analyzer", "fullName": "clang static analyzer",
"language": "en-US", "language": "en-US",
"name": "clang", "name": "clang",
} }
} }
], ],
} }

clang/test/Analysis/diagnostics/sarif-multi-diagnostic-test.c

// RUN: %clang_analyze_cc1 -analyzer-checker=core,alpha.security.taint,debug.TaintTest %s -verify -analyzer-output=sarif -o - | %normalize_sarif | diff -U1 -b %S/Inputs/expected-sarif/sarif-multi-diagnostic-test.c.sarif - // RUN: %clang_analyze_cc1 -analyzer-checker=core,alpha.security.taint,debug.TaintTest,unix.Malloc %s -verify -analyzer-output=sarif -o - | %normalize_sarif | diff -U1 -b %S/Inputs/expected-sarif/sarif-multi-diagnostic-test.c.sarif -
#include "../Inputs/system-header-simulator.h" #include "../Inputs/system-header-simulator.h"
#include "../Inputs/system-header-simulator-for-malloc.h"
#define ERR -1
int atoi(const char *nptr); int atoi(const char *nptr);
void f(void) { void f(void) {
char s[80]; char s[80];
scanf("%s", s); scanf("%s", s);
int d = atoi(s); // expected-warning {{tainted}} int d = atoi(s); // expected-warning {{tainted}}
} }
void g(void) { void g(void) {
void (*fp)(int); void (*fp)(int);
fp(12); // expected-warning {{Called function pointer is an uninitialized pointer value}} fp(12); // expected-warning {{Called function pointer is an uninitialized pointer value}}
} }
int h(int i) { int h(int i) {
if (i == 0) if (i == 0)
return 1 / i; // expected-warning {{Division by zero}} return 1 / i; // expected-warning {{Division by zero}}
return 0; return 0;
} }
int leak(int i) {
void *mem = malloc(8);
if (i < 4)
return ERR; // expected-warning {{Potential leak of memory pointed to by 'mem'}}
free(mem);
return 0;
}
int main(void) { int main(void) {
f(); f();
g(); g();
h(0); h(0);
leak(0);
return 0; return 0;
} }