From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2209) id 479643858407; Thu, 3 Feb 2022 22:46:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 479643858407 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: David Malcolm To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-7039] analyzer: fix zero-fill of calloc X-Act-Checkin: gcc X-Git-Author: David Malcolm X-Git-Refname: refs/heads/master X-Git-Oldrev: 5a668ec0339c28b0725ded1e80d3276edb76b8b3 X-Git-Newrev: 23b2cb628e5da84ad9c5422d5b2b6b2d36318ece Message-Id: <20220203224625.479643858407@sourceware.org> Date: Thu, 3 Feb 2022 22:46:25 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Feb 2022 22:46:25 -0000 https://gcc.gnu.org/g:23b2cb628e5da84ad9c5422d5b2b6b2d36318ece commit r12-7039-g23b2cb628e5da84ad9c5422d5b2b6b2d36318ece Author: David Malcolm Date: Thu Feb 3 11:15:48 2022 -0500 analyzer: fix zero-fill of calloc It turned out that the analyzer wasn't treating calloc regions as zero-filled, due to binding_cluster::fill_region getting an unknown value for the byte_size_size_sval, and thus get_or_create_repeated_svalue returning an unknown_svalue, which was then used to fill the region. Fixed thusly. gcc/analyzer/ChangeLog: * region-model-impl-calls.cc (region_model::impl_call_calloc): Use a sized_region when calling zero_fill_region. gcc/testsuite/ChangeLog: * gcc.dg/analyzer/calloc-1.c: New test. Signed-off-by: David Malcolm Diff: --- gcc/analyzer/region-model-impl-calls.cc | 4 +++- gcc/testsuite/gcc.dg/analyzer/calloc-1.c | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/gcc/analyzer/region-model-impl-calls.cc b/gcc/analyzer/region-model-impl-calls.cc index c20058ec778..779d94388e9 100644 --- a/gcc/analyzer/region-model-impl-calls.cc +++ b/gcc/analyzer/region-model-impl-calls.cc @@ -373,7 +373,9 @@ region_model::impl_call_calloc (const call_details &cd) nmemb_sval, size_sval); const region *new_reg = create_region_for_heap_alloc (prod_sval, cd.get_ctxt ()); - zero_fill_region (new_reg); + const region *sized_reg + = m_mgr->get_sized_region (new_reg, NULL_TREE, prod_sval); + zero_fill_region (sized_reg); if (cd.get_lhs_type ()) { const svalue *ptr_sval diff --git a/gcc/testsuite/gcc.dg/analyzer/calloc-1.c b/gcc/testsuite/gcc.dg/analyzer/calloc-1.c new file mode 100644 index 00000000000..bc28128671f --- /dev/null +++ b/gcc/testsuite/gcc.dg/analyzer/calloc-1.c @@ -0,0 +1,27 @@ +#include "analyzer-decls.h" + +typedef __SIZE_TYPE__ size_t; + +#define NULL ((void *)0) + +extern void *calloc (size_t __nmemb, size_t __size) + __attribute__ ((__nothrow__ , __leaf__)) + __attribute__ ((__malloc__)) + __attribute__ ((__alloc_size__ (1, 2))) ; + +char *test_1 (size_t sz) +{ + char *p; + + p = calloc (1, 3); + if (!p) + return NULL; + + __analyzer_dump_capacity (p); /* { dg-warning "capacity: '\\(\[^\n\r\]*\\)3'" } */ + + __analyzer_eval (p[0] == 0); /* { dg-warning "TRUE" } */ + __analyzer_eval (p[1] == 0); /* { dg-warning "TRUE" } */ + __analyzer_eval (p[2] == 0); /* { dg-warning "TRUE" } */ + + return p; +}