Skip to content

CPP: Exclude switch statements from HResultBooleanConversion.ql #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 29, 2018
Merged

CPP: Exclude switch statements from HResultBooleanConversion.ql #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
298ead1
CPP: Add more test cases for HResultBooleanConversion.ql.
geoffw0 Oct 19, 2018
e9499b5
CPP: Exclude switch statements.
geoffw0 Oct 19, 2018
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
1 change: 1 addition & 0 deletions cpp/ql/src/Security/CWE/CWE-253/HResultBooleanConversion.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ where exists
ctls.getControllingExpr() = e1
and e1.getType().(TypedefType).hasName("HRESULT")
and not isHresultBooleanConverted(e1)
and not ctls instanceof SwitchStmt // not controlled by a boolean condition
and msg = "Direct usage of a type " + e1.getType().toString() + " as a conditional expression"
)
or
Expand Down
22 changes: 22 additions & 0 deletions cpp/ql/test/query-tests/Security/CWE/CWE-253/HResultBooleanConversion.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,26 @@ void IncorrectTypeConversionTest() {
{
// ...
}

if (HresultFunction() == S_FALSE) // Correct Usage
{
// ...
}

while (!HresultFunction()) {}; // BUG
while (FAILED(HresultFunction())) {}; // Correct Usage

switch(hr) // Correct Usage
{
case S_OK:
case S_FALSE:
{
// ...
} break;

default:
{
// ...
} break;
}
}
22 changes: 22 additions & 0 deletions cpp/ql/test/query-tests/Security/CWE/CWE-253/HResultBooleanConversion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,26 @@ void IncorrectTypeConversionTest() {
{
// ...
}

if (HresultFunction() == S_FALSE) // Correct Usage
{
// ...
}

while (!HresultFunction()) {}; // BUG
while (FAILED(HresultFunction())) {}; // Correct Usage

switch(hr) // Correct Usage
{
case S_OK:
case S_FALSE:
{
// ...
} break;

default:
{
// ...
} break;
}
}
2 changes: 2 additions & 0 deletions cpp/ql/test/query-tests/Security/CWE/CWE-253/HResultBooleanConversion.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
| HResultBooleanConversion.c:79:15:79:38 | call to IncorrectHresultFunction | Implicit conversion from HRESULT to bool |
| HResultBooleanConversion.c:82:10:82:11 | hr | Usage of a type HRESULT as an argument of a unary logical operation |
| HResultBooleanConversion.c:92:9:92:10 | hr | Direct usage of a type HRESULT as a conditional expression |
| HResultBooleanConversion.c:106:13:106:27 | call to HresultFunction | Usage of a type HRESULT as an argument of a unary logical operation |
| HResultBooleanConversion.cpp:39:12:39:23 | call to BoolFunction | Implicit conversion from BOOL to HRESULT |
| HResultBooleanConversion.cpp:44:12:44:24 | call to BoolFunction2 | Implicit conversion from bool to HRESULT |
| HResultBooleanConversion.cpp:50:15:50:16 | hr | Explicit conversion from HRESULT to BOOL |
Expand All @@ -18,3 +19,4 @@
| HResultBooleanConversion.cpp:76:15:76:38 | call to IncorrectHresultFunction | Implicit conversion from HRESULT to bool |
| HResultBooleanConversion.cpp:79:10:79:11 | hr | Implicit conversion from HRESULT to bool |
| HResultBooleanConversion.cpp:89:9:89:10 | hr | Implicit conversion from HRESULT to bool |
| HResultBooleanConversion.cpp:103:13:103:27 | call to HresultFunction | Implicit conversion from HRESULT to bool |