aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMartin Uecker <uecker@tugraz.at>2023-11-02 13:12:15 +0100
committerMartin Uecker <uecker@tugraz.at>2023-11-02 14:54:53 +0100
commitf432a594fe6d3a0de1330ba69200d158e6248083 (patch)
tree046368e1ad76258eafb93b74206e0f28ed56ac87 /gcc
parent04802ed3b94bdc3083547ac08bca71764a004d01 (diff)
downloadgcc-f432a594fe6d3a0de1330ba69200d158e6248083.zip
gcc-f432a594fe6d3a0de1330ba69200d158e6248083.tar.gz
gcc-f432a594fe6d3a0de1330ba69200d158e6248083.tar.bz2
c: Add missing conditions in Walloc-size to avoid ICEs [PR112347]
Fix ICE because of forgotten checks for pointers to void and incomplete arrays. Committed as obvious. PR c/112347 gcc/c: * c-typeck.cc (convert_for_assignment): Add missing check. gcc/testsuite: * gcc.dg/Walloc-size-3.c: New test.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/c/c-typeck.cc1
-rw-r--r--gcc/testsuite/gcc.dg/Walloc-size-3.c15
2 files changed, 16 insertions, 0 deletions
diff --git a/gcc/c/c-typeck.cc b/gcc/c/c-typeck.cc
index 16fadfb..bdd57aa 100644
--- a/gcc/c/c-typeck.cc
+++ b/gcc/c/c-typeck.cc
@@ -7367,6 +7367,7 @@ convert_for_assignment (location_t location, location_t expr_loc, tree type,
idx = TREE_INT_CST_LOW (TREE_VALUE (TREE_CHAIN (args))) - 1;
tree arg = CALL_EXPR_ARG (rhs, idx);
if (TREE_CODE (arg) == INTEGER_CST
+ && !VOID_TYPE_P (ttl) && TYPE_SIZE_UNIT (ttl)
&& INTEGER_CST == TREE_CODE (TYPE_SIZE_UNIT (ttl))
&& tree_int_cst_lt (arg, TYPE_SIZE_UNIT (ttl)))
warning_at (location, OPT_Walloc_size, "allocation of "
diff --git a/gcc/testsuite/gcc.dg/Walloc-size-3.c b/gcc/testsuite/gcc.dg/Walloc-size-3.c
new file mode 100644
index 0000000..b95e04a
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Walloc-size-3.c
@@ -0,0 +1,15 @@
+/* PR 112347
+ { dg-do compile }
+ { dg-options "-Walloc-size" }
+ * */
+
+// Test that various types without size do not crash with -Walloc-size
+
+int * mallocx(unsigned long) __attribute__((malloc)) __attribute__((alloc_size(1)));
+void test_oom(void) { void *a_ = mallocx(1); }
+
+void parse_args(char (**child_args_ptr_ptr)[]) {
+ *child_args_ptr_ptr = __builtin_calloc(1, sizeof(char));
+}
+
+