procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* c-typeck.c (digest_init): Shorten overlength strings.

Browse source 
From-SVN: r264291
This commit is contained in:
Bernd Edlinger 2018-09-13 21:40:38 +00:00 • committed by Jeff Law
parent 84cdf51de4
commit 4a426e366e
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/c/ChangeLog
View file

@ -1,3 +1,7 @@
2018-09-13 Bernd Edlinger <bernd.edlinger@hotmail.de>
* c-typeck.c (digest_init): Shorten overlength strings.
2018-09-06 Bernd Edlinger <bernd.edlinger@hotmail.de>
* c-decl.c (finish_decl): Call complete_flexible_array_elts.

15
gcc/c/c-typeck.c
View file

@ -7485,19 +7485,17 @@ digest_init (location_t init_loc, tree type, tree init, tree origtype,
}
}
TREE_TYPE (inside_init) = type;
if (TYPE_DOMAIN (type) != NULL_TREE
&& TYPE_SIZE (type) != NULL_TREE
&& TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST)
{
unsigned HOST_WIDE_INT len = TREE_STRING_LENGTH (inside_init);
unsigned unit = TYPE_PRECISION (typ1) / BITS_PER_UNIT;
/* Subtract the size of a single (possibly wide) character
because it's ok to ignore the terminating null char
that is counted in the length of the constant. */
if (compare_tree_int (TYPE_SIZE_UNIT (type),
(len - (TYPE_PRECISION (typ1)
/ BITS_PER_UNIT))) < 0)
if (compare_tree_int (TYPE_SIZE_UNIT (type), len - unit) < 0)
pedwarn_init (init_loc, 0,
("initializer-string for array of chars "
"is too long"));
@ -7506,8 +7504,17 @@ digest_init (location_t init_loc, tree type, tree init, tree origtype,
warning_at (init_loc, OPT_Wc___compat,
("initializer-string for array chars "
"is too long for C++"));
if (compare_tree_int (TYPE_SIZE_UNIT (type), len) < 0)
{
unsigned HOST_WIDE_INT size
= tree_to_uhwi (TYPE_SIZE_UNIT (type));
const char *p = TREE_STRING_POINTER (inside_init);
inside_init = build_string (size, p);
}
}
TREE_TYPE (inside_init) = type;
return inside_init;
}
else if (INTEGRAL_TYPE_P (typ1))