CPP: Exclude switch statements.

geoffw0 · geoffw0 · commit e9499b59e4d8 · 2018-10-19T10:24:29.000+01:00
diff --git a/cpp/ql/src/Security/CWE/CWE-253/HResultBooleanConversion.ql b/cpp/ql/src/Security/CWE/CWE-253/HResultBooleanConversion.ql
@@ -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
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-253/HResultBooleanConversion.c b/cpp/ql/test/query-tests/Security/CWE/CWE-253/HResultBooleanConversion.c
@@ -106,7 +106,7 @@ void IncorrectTypeConversionTest() {
     while (!HresultFunction()) {}; // BUG
     while (FAILED(HresultFunction())) {}; // Correct Usage
 
-    switch(hr) // Correct Usage [FALSE POSITIVE]
+    switch(hr) // Correct Usage
     {
     case S_OK:
     case S_FALSE:
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-253/HResultBooleanConversion.cpp b/cpp/ql/test/query-tests/Security/CWE/CWE-253/HResultBooleanConversion.cpp
@@ -103,7 +103,7 @@ void IncorrectTypeConversionTest() {
     while (!HresultFunction()) {}; // BUG
     while (FAILED(HresultFunction())) {}; // Correct Usage
 
-    switch(hr) // Correct Usage [FALSE POSITIVE]
+    switch(hr) // Correct Usage
     {
     case S_OK:
     case S_FALSE:
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-253/HResultBooleanConversion.expected b/cpp/ql/test/query-tests/Security/CWE/CWE-253/HResultBooleanConversion.expected
@@ -9,7 +9,6 @@
 | 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.c:109:12:109:13 | hr | Direct usage of a type HRESULT as a conditional expression |
 | 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 |
@@ -21,4 +20,3 @@
 | 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 |
-| HResultBooleanConversion.cpp:106:12:106:13 | hr | Direct usage of a type HRESULT as a conditional expression |

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ where exists`
`48`	`48`	`ctls.getControllingExpr() = e1`
`49`	`49`	`and e1.getType().(TypedefType).hasName("HRESULT")`
`50`	`50`	`and not isHresultBooleanConverted(e1)`
	`51`	`+ and not ctls instanceof SwitchStmt // not controlled by a boolean condition`
`51`	`52`	`and msg = "Direct usage of a type " + e1.getType().toString() + " as a conditional expression"`
`52`	`53`	`)`
`53`	`54`	`or`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ void IncorrectTypeConversionTest() {`
`106`	`106`	`while (!HresultFunction()) {}; // BUG`
`107`	`107`	`while (FAILED(HresultFunction())) {}; // Correct Usage`
`108`	`108`
`109`		`- switch(hr) // Correct Usage [FALSE POSITIVE]`
	`109`	`+ switch(hr) // Correct Usage`
`110`	`110`	`{`
`111`	`111`	`case S_OK:`
`112`	`112`	`case S_FALSE:`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ void IncorrectTypeConversionTest() {`
`103`	`103`	`while (!HresultFunction()) {}; // BUG`
`104`	`104`	`while (FAILED(HresultFunction())) {}; // Correct Usage`
`105`	`105`
`106`		`- switch(hr) // Correct Usage [FALSE POSITIVE]`
	`106`	`+ switch(hr) // Correct Usage`
`107`	`107`	`{`
`108`	`108`	`case S_OK:`
`109`	`109`	`case S_FALSE:`