From 87fa7c1c3d9bc079d46d045a182591c2347d7aaa Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Fri, 5 Jul 2024 19:49:48 +0200
Subject: [PATCH 1/4] STR34-C: Do not consider integer type aliases in
 templates

---
 .../CastCharBeforeConvertingToLargerSizes.ql  | 21 +++++----------
 ...CharBeforeConvertingToLargerSizes.expected | 21 ---------------
 ...astCharBeforeConvertingToLargerSizes.qlref |  1 -
 ...tCharBeforeConvertingToLargerSizes.testref |  1 +
 ...oreConvertingToLargerSizes_shared.expected | 21 +++++++++++++++
 ...ertingToLargerSizes_shared.expected.clang} | 14 +++++-----
 ...nvertingToLargerSizes_shared.expected.gcc} | 12 ++++-----
 ...nvertingToLargerSizes_shared.expected.qcc} | 14 +++++-----
 ...harBeforeConvertingToLargerSizes_shared.ql |  4 +++
 .../test.c                                    |  2 ++
 ...arBeforeConvertingToLargerSizes_shared.qll | 26 +++++++++++++++++++
 ...oreConvertingToLargerSizes_shared.expected |  2 ++
 ...harBeforeConvertingToLargerSizes_shared.ql |  4 +++
 .../test.cpp                                  | 17 ++++++++++++
 rule_packages/c/Strings3.json                 |  1 +
 15 files changed, 105 insertions(+), 56 deletions(-)
 delete mode 100644 c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.expected
 delete mode 100644 c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.qlref
 create mode 100644 c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.testref
 create mode 100644 c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected
 rename c/{cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.expected.gcc => common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.clang} (75%)
 rename c/{cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.expected.clang => common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.gcc} (78%)
 rename c/{cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.expected.qcc => common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.qcc} (75%)
 create mode 100644 c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql
 rename c/{cert/test/rules/STR34-C => common/test/rules/castcharbeforeconvertingtolargersizes_shared}/test.c (95%)
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.qll
 create mode 100644 cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected
 create mode 100644 cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql
 create mode 100644 cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/test.cpp

diff --git a/c/cert/src/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.ql b/c/cert/src/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.ql
index b0d4088f9f..1f2af0b588 100644
--- a/c/cert/src/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.ql
+++ b/c/cert/src/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.ql
@@ -14,18 +14,11 @@
 
 import cpp
 import codingstandards.c.cert
-import semmle.code.cpp.commons.CommonType
+import codingstandards.cpp.rules.castcharbeforeconvertingtolargersizes_shared.CastCharBeforeConvertingToLargerSizes_shared
 
-from Cast c
-where
-  not isExcluded(c, Strings3Package::castCharBeforeConvertingToLargerSizesQuery()) and
-  // find cases where there is a conversion happening wherein the
-  // base type is a char
-  c.getExpr().getType() instanceof CharType and
-  not c.getExpr().getType() instanceof UnsignedCharType and
-  // it's a bigger type
-  c.getType().getSize() > c.getExpr().getType().getSize() and
-  // and it's some kind of integer type
-  c.getType() instanceof IntegralType
-select c.getExpr(),
-  "Expression not converted to `unsigned char` before converting to a larger integer type."
+class CastCharBeforeConvertingToLargerSizesQuery extends CastCharBeforeConvertingToLargerSizes_sharedSharedQuery
+{
+  CastCharBeforeConvertingToLargerSizesQuery() {
+    this = Strings3Package::castCharBeforeConvertingToLargerSizesQuery()
+  }
+}
diff --git a/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.expected b/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.expected
deleted file mode 100644
index 1c6424dc0c..0000000000
--- a/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.expected
+++ /dev/null
@@ -1,21 +0,0 @@
-| test.c:7:7:7:14 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:28:11:28:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:29:3:29:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:29:11:29:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:31:11:31:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:32:11:32:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:33:3:33:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:33:11:33:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:34:3:34:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:34:11:34:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:35:3:35:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:35:11:35:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:36:3:36:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:36:11:36:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:37:11:37:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:38:11:38:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:39:3:39:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:39:11:39:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:40:12:40:13 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:42:11:42:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:43:11:43:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
diff --git a/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.qlref b/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.qlref
deleted file mode 100644
index 379d3b3f68..0000000000
--- a/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.qlref
+++ /dev/null
@@ -1 +0,0 @@
-rules/STR34-C/CastCharBeforeConvertingToLargerSizes.ql
\ No newline at end of file
diff --git a/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.testref b/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.testref
new file mode 100644
index 0000000000..fefb98580c
--- /dev/null
+++ b/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.testref
@@ -0,0 +1 @@
+c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql
\ No newline at end of file
diff --git a/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected b/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected
new file mode 100644
index 0000000000..c318f791e9
--- /dev/null
+++ b/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected
@@ -0,0 +1,21 @@
+| test.c:9:7:9:14 | (int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:30:11:30:12 | (int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:31:3:31:13 | (unsigned int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:31:11:31:12 | (int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:33:11:33:12 | (int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:34:11:34:12 | (int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:35:3:35:13 | (unsigned int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:35:11:35:12 | (int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:36:3:36:13 | (unsigned int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:36:11:36:12 | (int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:37:3:37:13 | (unsigned int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:37:11:37:12 | (int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:38:3:38:13 | (unsigned int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:38:11:38:12 | (int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:39:11:39:12 | (int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:40:11:40:12 | (int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:41:3:41:13 | (unsigned int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:41:11:41:12 | (int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:42:12:42:13 | (int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:44:11:44:12 | (int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:45:11:45:12 | (int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
diff --git a/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.expected.gcc b/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.clang
similarity index 75%
rename from c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.expected.gcc
rename to c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.clang
index 1cf143a196..0378c8a6b5 100644
--- a/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.expected.gcc
+++ b/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.clang
@@ -1,8 +1,6 @@
-| test.c:7:7:7:14 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:28:3:28:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:29:3:29:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:9:7:9:14 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:30:3:30:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:31:3:31:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:32:3:32:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:33:3:33:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:34:3:34:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:35:3:35:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
@@ -10,6 +8,8 @@
 | test.c:37:3:37:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:38:3:38:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:39:3:39:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:40:3:40:14 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:42:11:42:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:43:11:43:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:40:3:40:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:41:3:41:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:42:3:42:14 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:44:11:44:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:45:11:45:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
diff --git a/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.expected.clang b/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.gcc
similarity index 78%
rename from c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.expected.clang
rename to c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.gcc
index 1cf143a196..f729c9e42d 100644
--- a/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.expected.clang
+++ b/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.gcc
@@ -1,8 +1,6 @@
-| test.c:7:7:7:14 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:28:3:28:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:29:3:29:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:9:7:9:14 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:30:3:30:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:31:3:31:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:32:3:32:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:33:3:33:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:34:3:34:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:35:3:35:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
@@ -10,6 +8,8 @@
 | test.c:37:3:37:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:38:3:38:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:39:3:39:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:40:3:40:14 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:42:11:42:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:40:3:40:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:41:3:41:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:42:3:42:14 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:43:11:43:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:44:11:44:12 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
diff --git a/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.expected.qcc b/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.qcc
similarity index 75%
rename from c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.expected.qcc
rename to c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.qcc
index fec6522014..551423495c 100644
--- a/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.expected.qcc
+++ b/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.qcc
@@ -1,8 +1,6 @@
-| test.c:7:7:7:14 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:28:3:28:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:29:3:29:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:9:7:9:14 | * ... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:30:3:30:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:31:3:31:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:32:3:32:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:33:3:33:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:34:3:34:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:35:3:35:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
@@ -10,6 +8,8 @@
 | test.c:37:3:37:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:38:3:38:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
 | test.c:39:3:39:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:40:3:40:14 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:42:3:42:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
-| test.c:43:3:43:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:40:3:40:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:41:3:41:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:42:3:42:14 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:44:3:44:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.c:45:3:45:13 | (...) | Expression not converted to `unsigned char` before converting to a larger integer type. |
diff --git a/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql b/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql
new file mode 100644
index 0000000000..2aceff89c0
--- /dev/null
+++ b/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.castcharbeforeconvertingtolargersizes_shared.CastCharBeforeConvertingToLargerSizes_shared
+
+class TestFileQuery extends CastCharBeforeConvertingToLargerSizes_sharedSharedQuery, TestQuery { }
diff --git a/c/cert/test/rules/STR34-C/test.c b/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/test.c
similarity index 95%
rename from c/cert/test/rules/STR34-C/test.c
rename to c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/test.c
index d4bd825c8e..8865e477fb 100644
--- a/c/cert/test/rules/STR34-C/test.c
+++ b/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/test.c
@@ -1,3 +1,5 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C++ TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
 #include <ctype.h>
 #include <stdio.h>
 
diff --git a/cpp/common/src/codingstandards/cpp/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.qll b/cpp/common/src/codingstandards/cpp/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.qll
new file mode 100644
index 0000000000..3ef9033910
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.qll
@@ -0,0 +1,26 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class CastCharBeforeConvertingToLargerSizes_sharedSharedQuery extends Query { }
+
+Query getQuery() { result instanceof CastCharBeforeConvertingToLargerSizes_sharedSharedQuery }
+
+query predicate problems(Cast c, string message) {
+  not isExcluded(c, getQuery()) and
+  // find cases where there is a conversion happening wherein the
+  // base type is a char
+  c.getExpr().getType() instanceof CharType and
+  not c.getExpr().getType() instanceof UnsignedCharType and
+  // it's a bigger type
+  c.getType().getSize() > c.getExpr().getType().getSize() and
+  // and it's some kind of integer type
+  c.getType().getUnderlyingType() instanceof IntegralType and
+  not c.isFromTemplateInstantiation(_) and
+  message =
+    "Expression not converted to `unsigned char` before converting to a larger integer type."
+}
diff --git a/cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected b/cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected
new file mode 100644
index 0000000000..886d03ddac
--- /dev/null
+++ b/cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected
@@ -0,0 +1,2 @@
+| test.cpp:11:9:11:9 | (int32_t)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
+| test.cpp:12:41:12:41 | (signed int)... | Expression not converted to `unsigned char` before converting to a larger integer type. |
diff --git a/cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql b/cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql
new file mode 100644
index 0000000000..2aceff89c0
--- /dev/null
+++ b/cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql
@@ -0,0 +1,4 @@
+// GENERATED FILE - DO NOT MODIFY
+import codingstandards.cpp.rules.castcharbeforeconvertingtolargersizes_shared.CastCharBeforeConvertingToLargerSizes_shared
+
+class TestFileQuery extends CastCharBeforeConvertingToLargerSizes_sharedSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/test.cpp b/cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/test.cpp
new file mode 100644
index 0000000000..4e5d90e714
--- /dev/null
+++ b/cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/test.cpp
@@ -0,0 +1,17 @@
+// NOTICE: THE TEST CASES BELOW ARE ALSO INCLUDED IN THE C TEST CASE AND
+// CHANGES SHOULD BE REFLECTED THERE AS WELL.
+#include <cstdint>
+
+template <typename S, typename T> S get(T t) {
+  S s = t; // COMPLIANT
+  return s;
+}
+
+void test(std::int32_t i32, std::int8_t i8, char c) {
+  i32 = c;                                   // NON_COMPLIANT
+  i32 = get<std::int32_t, std::int32_t>(c);  // NON_COMPLIANT
+  i32 = get<std::int32_t, std::int8_t>(c);   // COMPLIANT
+  i32 = i8;                                  // COMPLIANT
+  i32 = get<std::int32_t, std::int32_t>(i8); // COMPLIANT
+  i32 = get<std::int32_t, std::int8_t>(i8);  // COMPLIANT
+}
diff --git a/rule_packages/c/Strings3.json b/rule_packages/c/Strings3.json
index 9456f4b422..b0131fb55b 100644
--- a/rule_packages/c/Strings3.json
+++ b/rule_packages/c/Strings3.json
@@ -12,6 +12,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "CastCharBeforeConvertingToLargerSizes",
+          "shared_implementation_short_name": "CastCharBeforeConvertingToLargerSizes_shared",
           "tags": [
             "correctness",
             "security"

From dc6bed13a81d6956856ce1c58b9aee12f3d31ab3 Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Fri, 5 Jul 2024 20:00:09 +0200
Subject: [PATCH 2/4] Add change notes

---
 change_notes/2024-07-05-fix-fp-576-STR34-C.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 change_notes/2024-07-05-fix-fp-576-STR34-C.md

diff --git a/change_notes/2024-07-05-fix-fp-576-STR34-C.md b/change_notes/2024-07-05-fix-fp-576-STR34-C.md
new file mode 100644
index 0000000000..340d8f4288
--- /dev/null
+++ b/change_notes/2024-07-05-fix-fp-576-STR34-C.md
@@ -0,0 +1,2 @@
+- `STR34-C` - `CastCharBeforeConvertingToLargerSizes.ql`:
+  - Fixes #576. Do not consider integer type aliases in templates.
\ No newline at end of file

From e3a5b8cdd87726a0faa4862e24ee1db9b5257b08 Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Thu, 25 Jul 2024 20:13:49 +0200
Subject: [PATCH 3/4] renamed the shared query

---
 .../CastCharBeforeConvertingToLargerSizes.ql  |  4 +--
 ...tCharBeforeConvertingToLargerSizes.testref |  2 +-
 ...harBeforeConvertingToLargerSizes.expected} |  0
 ...oreConvertingToLargerSizes.expected.clang} |  0
 ...eforeConvertingToLargerSizes.expected.gcc} |  0
 ...eforeConvertingToLargerSizes.expected.qcc} |  0
 .../CastCharBeforeConvertingToLargerSizes.ql} |  4 +--
 .../test.c                                    |  0
 .../CastCharBeforeConvertingToLargerSizes.qll | 27 +++++++++++++++++++
 ...arBeforeConvertingToLargerSizes_shared.qll | 26 ------------------
 ...harBeforeConvertingToLargerSizes.expected} |  0
 .../CastCharBeforeConvertingToLargerSizes.ql} |  4 +--
 .../test.cpp                                  |  0
 rule_packages/c/Strings3.json                 |  2 +-
 14 files changed, 35 insertions(+), 34 deletions(-)
 rename c/common/test/rules/{castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected => castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.expected} (100%)
 rename c/common/test/rules/{castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.clang => castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.expected.clang} (100%)
 rename c/common/test/rules/{castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.gcc => castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.expected.gcc} (100%)
 rename c/common/test/rules/{castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.qcc => castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.expected.qcc} (100%)
 rename c/common/test/rules/{castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql => castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.ql} (63%)
 rename c/common/test/rules/{castcharbeforeconvertingtolargersizes_shared => castcharbeforeconvertingtolargersizes}/test.c (100%)
 create mode 100644 cpp/common/src/codingstandards/cpp/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.qll
 delete mode 100644 cpp/common/src/codingstandards/cpp/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.qll
 rename cpp/common/test/rules/{castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected => castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.expected} (100%)
 rename cpp/common/test/rules/{castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql => castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.ql} (63%)
 rename cpp/common/test/rules/{castcharbeforeconvertingtolargersizes_shared => castcharbeforeconvertingtolargersizes}/test.cpp (100%)

diff --git a/c/cert/src/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.ql b/c/cert/src/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.ql
index 1f2af0b588..394df49d99 100644
--- a/c/cert/src/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.ql
+++ b/c/cert/src/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.ql
@@ -14,9 +14,9 @@
 
 import cpp
 import codingstandards.c.cert
-import codingstandards.cpp.rules.castcharbeforeconvertingtolargersizes_shared.CastCharBeforeConvertingToLargerSizes_shared
+import codingstandards.cpp.rules.castcharbeforeconvertingtolargersizes.CastCharBeforeConvertingToLargerSizes
 
-class CastCharBeforeConvertingToLargerSizesQuery extends CastCharBeforeConvertingToLargerSizes_sharedSharedQuery
+class CastCharBeforeConvertingToLargerSizesQuery extends CastCharBeforeConvertingToLargerSizesSharedQuery
 {
   CastCharBeforeConvertingToLargerSizesQuery() {
     this = Strings3Package::castCharBeforeConvertingToLargerSizesQuery()
diff --git a/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.testref b/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.testref
index fefb98580c..0e13e05dc3 100644
--- a/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.testref
+++ b/c/cert/test/rules/STR34-C/CastCharBeforeConvertingToLargerSizes.testref
@@ -1 +1 @@
-c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql
\ No newline at end of file
+c/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.ql
\ No newline at end of file
diff --git a/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected b/c/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.expected
similarity index 100%
rename from c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected
rename to c/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.expected
diff --git a/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.clang b/c/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.expected.clang
similarity index 100%
rename from c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.clang
rename to c/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.expected.clang
diff --git a/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.gcc b/c/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.expected.gcc
similarity index 100%
rename from c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.gcc
rename to c/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.expected.gcc
diff --git a/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.qcc b/c/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.expected.qcc
similarity index 100%
rename from c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected.qcc
rename to c/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.expected.qcc
diff --git a/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql b/c/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.ql
similarity index 63%
rename from c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql
rename to c/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.ql
index 2aceff89c0..2a1e49774f 100644
--- a/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql
+++ b/c/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.ql
@@ -1,4 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.castcharbeforeconvertingtolargersizes_shared.CastCharBeforeConvertingToLargerSizes_shared
+import codingstandards.cpp.rules.castcharbeforeconvertingtolargersizes.CastCharBeforeConvertingToLargerSizes
 
-class TestFileQuery extends CastCharBeforeConvertingToLargerSizes_sharedSharedQuery, TestQuery { }
+class TestFileQuery extends CastCharBeforeConvertingToLargerSizesSharedQuery, TestQuery { }
diff --git a/c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/test.c b/c/common/test/rules/castcharbeforeconvertingtolargersizes/test.c
similarity index 100%
rename from c/common/test/rules/castcharbeforeconvertingtolargersizes_shared/test.c
rename to c/common/test/rules/castcharbeforeconvertingtolargersizes/test.c
diff --git a/cpp/common/src/codingstandards/cpp/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.qll b/cpp/common/src/codingstandards/cpp/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.qll
new file mode 100644
index 0000000000..5d396f9a42
--- /dev/null
+++ b/cpp/common/src/codingstandards/cpp/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.qll
@@ -0,0 +1,27 @@
+/**
+ * Provides a library which includes a `problems` predicate for reporting....
+ */
+
+ import cpp
+ import codingstandards.cpp.Customizations
+ import codingstandards.cpp.Exclusions
+ 
+ abstract class CastCharBeforeConvertingToLargerSizesSharedQuery extends Query { }
+ 
+ Query getQuery() { result instanceof CastCharBeforeConvertingToLargerSizesSharedQuery }
+ 
+ query predicate problems(Cast c, string message) {
+   not isExcluded(c, getQuery()) and
+   // find cases where there is a conversion happening wherein the
+   // base type is a char
+   c.getExpr().getType() instanceof CharType and
+   not c.getExpr().getType() instanceof UnsignedCharType and
+   // it's a bigger type
+   c.getType().getSize() > c.getExpr().getType().getSize() and
+   // and it's some kind of integer type
+   c.getType().getUnderlyingType() instanceof IntegralType and
+   not c.isFromTemplateInstantiation(_) and
+   message =
+     "Expression not converted to `unsigned char` before converting to a larger integer type."
+ }
+ 
\ No newline at end of file
diff --git a/cpp/common/src/codingstandards/cpp/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.qll b/cpp/common/src/codingstandards/cpp/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.qll
deleted file mode 100644
index 3ef9033910..0000000000
--- a/cpp/common/src/codingstandards/cpp/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.qll
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Provides a library which includes a `problems` predicate for reporting....
- */
-
-import cpp
-import codingstandards.cpp.Customizations
-import codingstandards.cpp.Exclusions
-
-abstract class CastCharBeforeConvertingToLargerSizes_sharedSharedQuery extends Query { }
-
-Query getQuery() { result instanceof CastCharBeforeConvertingToLargerSizes_sharedSharedQuery }
-
-query predicate problems(Cast c, string message) {
-  not isExcluded(c, getQuery()) and
-  // find cases where there is a conversion happening wherein the
-  // base type is a char
-  c.getExpr().getType() instanceof CharType and
-  not c.getExpr().getType() instanceof UnsignedCharType and
-  // it's a bigger type
-  c.getType().getSize() > c.getExpr().getType().getSize() and
-  // and it's some kind of integer type
-  c.getType().getUnderlyingType() instanceof IntegralType and
-  not c.isFromTemplateInstantiation(_) and
-  message =
-    "Expression not converted to `unsigned char` before converting to a larger integer type."
-}
diff --git a/cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected b/cpp/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.expected
similarity index 100%
rename from cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.expected
rename to cpp/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.expected
diff --git a/cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql b/cpp/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.ql
similarity index 63%
rename from cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql
rename to cpp/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.ql
index 2aceff89c0..2a1e49774f 100644
--- a/cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/CastCharBeforeConvertingToLargerSizes_shared.ql
+++ b/cpp/common/test/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.ql
@@ -1,4 +1,4 @@
 // GENERATED FILE - DO NOT MODIFY
-import codingstandards.cpp.rules.castcharbeforeconvertingtolargersizes_shared.CastCharBeforeConvertingToLargerSizes_shared
+import codingstandards.cpp.rules.castcharbeforeconvertingtolargersizes.CastCharBeforeConvertingToLargerSizes
 
-class TestFileQuery extends CastCharBeforeConvertingToLargerSizes_sharedSharedQuery, TestQuery { }
+class TestFileQuery extends CastCharBeforeConvertingToLargerSizesSharedQuery, TestQuery { }
diff --git a/cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/test.cpp b/cpp/common/test/rules/castcharbeforeconvertingtolargersizes/test.cpp
similarity index 100%
rename from cpp/common/test/rules/castcharbeforeconvertingtolargersizes_shared/test.cpp
rename to cpp/common/test/rules/castcharbeforeconvertingtolargersizes/test.cpp
diff --git a/rule_packages/c/Strings3.json b/rule_packages/c/Strings3.json
index b0131fb55b..1cecf390ec 100644
--- a/rule_packages/c/Strings3.json
+++ b/rule_packages/c/Strings3.json
@@ -12,7 +12,7 @@
           "precision": "very-high",
           "severity": "error",
           "short_name": "CastCharBeforeConvertingToLargerSizes",
-          "shared_implementation_short_name": "CastCharBeforeConvertingToLargerSizes_shared",
+          "shared_implementation_short_name": "CastCharBeforeConvertingToLargerSizes",
           "tags": [
             "correctness",
             "security"

From 946d5dfcc98f602be23a7cdfc3a0c10dcb258c30 Mon Sep 17 00:00:00 2001
From: Mauro Baluda <mbaluda@github.com>
Date: Thu, 25 Jul 2024 20:26:02 +0200
Subject: [PATCH 4/4] Fix formatting

---
 .../CastCharBeforeConvertingToLargerSizes.qll | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/cpp/common/src/codingstandards/cpp/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.qll b/cpp/common/src/codingstandards/cpp/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.qll
index 5d396f9a42..66f1006d17 100644
--- a/cpp/common/src/codingstandards/cpp/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/castcharbeforeconvertingtolargersizes/CastCharBeforeConvertingToLargerSizes.qll
@@ -2,26 +2,25 @@
  * Provides a library which includes a `problems` predicate for reporting....
  */
 
- import cpp
- import codingstandards.cpp.Customizations
- import codingstandards.cpp.Exclusions
- 
- abstract class CastCharBeforeConvertingToLargerSizesSharedQuery extends Query { }
- 
- Query getQuery() { result instanceof CastCharBeforeConvertingToLargerSizesSharedQuery }
- 
- query predicate problems(Cast c, string message) {
-   not isExcluded(c, getQuery()) and
-   // find cases where there is a conversion happening wherein the
-   // base type is a char
-   c.getExpr().getType() instanceof CharType and
-   not c.getExpr().getType() instanceof UnsignedCharType and
-   // it's a bigger type
-   c.getType().getSize() > c.getExpr().getType().getSize() and
-   // and it's some kind of integer type
-   c.getType().getUnderlyingType() instanceof IntegralType and
-   not c.isFromTemplateInstantiation(_) and
-   message =
-     "Expression not converted to `unsigned char` before converting to a larger integer type."
- }
- 
\ No newline at end of file
+import cpp
+import codingstandards.cpp.Customizations
+import codingstandards.cpp.Exclusions
+
+abstract class CastCharBeforeConvertingToLargerSizesSharedQuery extends Query { }
+
+Query getQuery() { result instanceof CastCharBeforeConvertingToLargerSizesSharedQuery }
+
+query predicate problems(Cast c, string message) {
+  not isExcluded(c, getQuery()) and
+  // find cases where there is a conversion happening wherein the
+  // base type is a char
+  c.getExpr().getType() instanceof CharType and
+  not c.getExpr().getType() instanceof UnsignedCharType and
+  // it's a bigger type
+  c.getType().getSize() > c.getExpr().getType().getSize() and
+  // and it's some kind of integer type
+  c.getType().getUnderlyingType() instanceof IntegralType and
+  not c.isFromTemplateInstantiation(_) and
+  message =
+    "Expression not converted to `unsigned char` before converting to a larger integer type."
+}