Skip to content

Commit

Permalink
Fix ICE in set_cell_span, at text-art/table.cc:148 with D front-end a…
Browse files Browse the repository at this point in the history
…nd -fanalyzer

The internal error in analyzer turned out to be caused by a subtly
invalid tree representation of STRING_CSTs in the D front-end, fixed by
including the terminating NULL as part of the TREE_STRING_POINTER.

When adding a first analyzer test for D, it flagged up another subtle
mismatch in one assignment in the module support routines as well, fixed
by generating the correct field type for the compiler-generated struct.

	PR d/111537

gcc/d/ChangeLog:

	* expr.cc (ExprVisitor::visit (StringExp *)): Include null terminator
	in STRING_CST string.
	* modules.cc (get_compiler_dso_type): Generate ModuleInfo** type for
	the minfo fields.

gcc/testsuite/ChangeLog:

	* gdc.dg/analyzer/analyzer.exp: New test.
	* gdc.dg/analyzer/pr111537.d: New test.
  • Loading branch information
ibuclaw committed Oct 14, 2023
1 parent 06d8aee commit 578afbc
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 7 deletions.
6 changes: 3 additions & 3 deletions gcc/d/expr.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2535,13 +2535,13 @@ class ExprVisitor : public Visitor
{
/* Copy the string contents to a null terminated string. */
dinteger_t length = (e->len * e->sz);
char *string = XALLOCAVEC (char, length + 1);
char *string = XALLOCAVEC (char, length + e->sz);
memset (string, 0, length + e->sz);
if (length > 0)
memcpy (string, e->string, length);
string[length] = '\0';

/* String value and type includes the null terminator. */
tree value = build_string (length, string);
tree value = build_string (length + e->sz, string);
TREE_TYPE (value) = make_array_type (tb->nextOf (), length + 1);
value = build_address (value);

Expand Down
9 changes: 5 additions & 4 deletions gcc/d/modules.cc
Original file line number Diff line number Diff line change
Expand Up @@ -277,12 +277,13 @@ get_compiler_dso_type (void)
DECL_CHAIN (field) = fields;
fields = field;

field = create_field_decl (build_pointer_type (get_moduleinfo_type ()),
NULL, 1, 1);
tree moduleinfo_ptr_ptr_type =
build_pointer_type (build_pointer_type (get_moduleinfo_type ()));

field = create_field_decl (moduleinfo_ptr_ptr_type, NULL, 1, 1);
DECL_CHAIN (field) = fields;
fields = field;
field = create_field_decl (build_pointer_type (get_moduleinfo_type ()),
NULL, 1, 1);
field = create_field_decl (moduleinfo_ptr_ptr_type, NULL, 1, 1);
DECL_CHAIN (field) = fields;
fields = field;

Expand Down
51 changes: 51 additions & 0 deletions gcc/testsuite/gdc.dg/analyzer/analyzer.exp
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Copyright (C) 2023 Free Software Foundation, Inc.

# This file is part of GCC.
#
# GCC is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free
# Software Foundation; either version 3, or (at your option) any later
# version.
#
# GCC is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with GCC; see the file COPYING3. If not see
# <http://www.gnu.org/licenses/>.

# GCC testsuite that uses the `dg.exp' driver.

# Load support procs.
load_lib gdc-dg.exp

# If the analyzer has not been enabled, bail.
if { ![check_effective_target_analyzer] } {
return
}

global DEFAULT_DFLAGS
if [info exists DEFAULT_DFLAGS] then {
set save_default_dflags $DEFAULT_DFLAGS
}

# If a testcase doesn't have special options, use these.
set DEFAULT_DFLAGS "-fanalyzer -Wanalyzer-too-complex -fanalyzer-call-summaries"

# Initialize `dg'.
dg-init

# Main loop.
gdc-dg-runtest [lsort \
[glob -nocomplain $srcdir/$subdir/*.d ] ] "" $DEFAULT_DFLAGS

# All done.
dg-finish

if [info exists save_default_dflags] {
set DEFAULT_DFLAGS $save_default_dflags
} else {
unset DEFAULT_DFLAGS
}
7 changes: 7 additions & 0 deletions gcc/testsuite/gdc.dg/analyzer/pr111537.d
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// { dg-do compile }
import core.stdc.string;
void main()
{
char[5] arr;
strcpy(arr.ptr, "hello world"); // { dg-warning "stack-based buffer overflow" }
}

0 comments on commit 578afbc

Please sign in to comment.