Skip to content

Commit e3a5b8c

Browse files
committed
renamed the shared query
1 parent dc6bed1 commit e3a5b8c

File tree

14 files changed

+35
-34
lines changed

14 files changed

+35
-34
lines changed

c/cert/src/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
import cpp
1616
import codingstandards.c.cert
17-
import codingstandards.cpp.rules.castcharbeforeconvertingtolargersizes_shared.CastCharBeforeConvertingToLargerSizes_shared
17+
import codingstandards.cpp.rules.castcharbeforeconvertingtolargersizes.CastCharBeforeConvertingToLargerSizes
1818

19-
class CastCharBeforeConvertingToLargerSizesQuery extends CastCharBeforeConvertingToLargerSizes_sharedSharedQuery
19+
class CastCharBeforeConvertingToLargerSizesQuery extends CastCharBeforeConvertingToLargerSizesSharedQuery
2020
{
2121
CastCharBeforeConvertingToLargerSizesQuery() {
2222
this = Strings3Package::castCharBeforeConvertingToLargerSizesQuery()
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql
1+
c/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.ql
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// GENERATED FILE - DO NOT MODIFY
2-
import codingstandards.cpp.rules.castcharbeforeconvertingtolargersizes_shared.CastCharBeforeConvertingToLargerSizes_shared
2+
import codingstandards.cpp.rules.castcharbeforeconvertingtolargersizes.CastCharBeforeConvertingToLargerSizes
33

4-
class TestFileQuery extends CastCharBeforeConvertingToLargerSizes_sharedSharedQuery, TestQuery { }
4+
class TestFileQuery extends CastCharBeforeConvertingToLargerSizesSharedQuery, TestQuery { }
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/**
2+
* Provides a library which includes a `problems` predicate for reporting....
3+
*/
4+
5+
import cpp
6+
import codingstandards.cpp.Customizations
7+
import codingstandards.cpp.Exclusions
8+
9+
abstract class CastCharBeforeConvertingToLargerSizesSharedQuery extends Query { }
10+
11+
Query getQuery() { result instanceof CastCharBeforeConvertingToLargerSizesSharedQuery }
12+
13+
query predicate problems(Cast c, string message) {
14+
not isExcluded(c, getQuery()) and
15+
// find cases where there is a conversion happening wherein the
16+
// base type is a char
17+
c.getExpr().getType() instanceof CharType and
18+
not c.getExpr().getType() instanceof UnsignedCharType and
19+
// it's a bigger type
20+
c.getType().getSize() > c.getExpr().getType().getSize() and
21+
// and it's some kind of integer type
22+
c.getType().getUnderlyingType() instanceof IntegralType and
23+
not c.isFromTemplateInstantiation(_) and
24+
message =
25+
"Expression not converted to `unsigned char` before converting to a larger integer type."
26+
}
27+

cpp/common/src/codingstandards/cpp/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.qll

Lines changed: 0 additions & 26 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// GENERATED FILE - DO NOT MODIFY
2-
import codingstandards.cpp.rules.castcharbeforeconvertingtolargersizes_shared.CastCharBeforeConvertingToLargerSizes_shared
2+
import codingstandards.cpp.rules.castcharbeforeconvertingtolargersizes.CastCharBeforeConvertingToLargerSizes
33

4-
class TestFileQuery extends CastCharBeforeConvertingToLargerSizes_sharedSharedQuery, TestQuery { }
4+
class TestFileQuery extends CastCharBeforeConvertingToLargerSizesSharedQuery, TestQuery { }

rule_packages/c/Strings3.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"precision": "very-high",
1313
"severity": "error",
1414
"short_name": "CastCharBeforeConvertingToLargerSizes",
15-
"shared_implementation_short_name": "CastCharBeforeConvertingToLargerSizes_shared",
15+
"shared_implementation_short_name": "CastCharBeforeConvertingToLargerSizes",
1616
"tags": [
1717
"correctness",
1818
"security"

0 commit comments

Comments
 (0)