| Message ID | 547134B7.5040603@gmail.com |
|---|---|
| State | New |
| Headers | show |
On Sun, Nov 23, 2014 at 09:13:27AM +0800, Chen Gang wrote: > 2014-11-23 Chen Gang <gang.chen.5i5j@gmail.com> > > * ubsan.c (ubsan_type_descriptor): Use 'pretty_print' for > 'pretty_name' to avoid memory overflow. Ok, with a small nit below. > gcc/ubsan.c | 63 +++++++++++++++++++++++++++++++++---------------------------- > 1 file changed, 34 insertions(+), 29 deletions(-) > > diff --git a/gcc/ubsan.c b/gcc/ubsan.c > index b3d5343..3fceff7 100644 > --- a/gcc/ubsan.c > +++ b/gcc/ubsan.c > @@ -369,7 +369,7 @@ ubsan_type_descriptor (tree type, enum ubsan_print_style pstyle) > tree dtype = ubsan_get_type_descriptor_type (); > tree type2 = type; > const char *tname = NULL; > - char *pretty_name; > + pretty_printer pretty_name; > unsigned char deref_depth = 0; > unsigned short tkind, tinfo; > > @@ -408,54 +408,58 @@ ubsan_type_descriptor (tree type, enum ubsan_print_style pstyle) > /* We weren't able to determine the type name. */ > tname = "<unknown>"; > > - /* Decorate the type name with '', '*', "struct", or "union". */ > - pretty_name = (char *) alloca (strlen (tname) + 16 + deref_depth); > if (pstyle == UBSAN_PRINT_POINTER) > { > - int pos = sprintf (pretty_name, "'%s%s%s%s%s%s%s", > - TYPE_VOLATILE (type2) ? "volatile " : "", > - TYPE_READONLY (type2) ? "const " : "", > - TYPE_RESTRICT (type2) ? "restrict " : "", > - TYPE_ATOMIC (type2) ? "_Atomic " : "", > - TREE_CODE (type2) == RECORD_TYPE > - ? "struct " > - : TREE_CODE (type2) == UNION_TYPE > - ? "union " : "", tname, > - deref_depth == 0 ? "" : " "); > + pp_printf (&pretty_name, "'%s%s%s%s%s%s%s", > + TYPE_VOLATILE (type2) ? "volatile " : "", > + TYPE_READONLY (type2) ? "const " : "", > + TYPE_RESTRICT (type2) ? "restrict " : "", > + TYPE_ATOMIC (type2) ? "_Atomic " : "", > + TREE_CODE (type2) == RECORD_TYPE > + ? "struct " > + : TREE_CODE (type2) == UNION_TYPE > + ? "union " : "", tname, > + deref_depth == 0 ? "" : " "); > while (deref_depth-- > 0) > - pretty_name[pos++] = '*'; > - pretty_name[pos++] = '\''; > - pretty_name[pos] = '\0'; > + pp_star (&pretty_name); > + pp_quote (&pretty_name); > } > else if (pstyle == UBSAN_PRINT_ARRAY) > { > /* Pretty print the array dimensions. */ > gcc_assert (TREE_CODE (type) == ARRAY_TYPE); > tree t = type; > - int pos = sprintf (pretty_name, "'%s ", tname); > + pp_printf (&pretty_name, "'%s ", tname); > while (deref_depth-- > 0) > - pretty_name[pos++] = '*'; > + pp_star (&pretty_name); > while (TREE_CODE (t) == ARRAY_TYPE) > { > - pretty_name[pos++] = '['; > + pp_left_bracket (&pretty_name); > tree dom = TYPE_DOMAIN (t); > if (dom && TREE_CODE (TYPE_MAX_VALUE (dom)) == INTEGER_CST) > - pos += sprintf (&pretty_name[pos], HOST_WIDE_INT_PRINT_DEC, > + { > + if (tree_fits_uhwi_p (TYPE_MAX_VALUE (dom)) > + && tree_to_uhwi (TYPE_MAX_VALUE (dom)) + 1 != 0) > + pp_printf (&pretty_name, HOST_WIDE_INT_PRINT_DEC, > tree_to_uhwi (TYPE_MAX_VALUE (dom)) + 1); > + else > + pp_wide_int(&pretty_name, > + wi::add (wi::to_widest (TYPE_MAX_VALUE (dom)), 1), > + TYPE_SIGN (TREE_TYPE (dom))); Space still missing before ( (and reindenting the following 2 lines). Jakub
On Mon, Nov 24, 2014 at 04:28:10PM +0800, Chen Gang wrote: > On 11/24/14 15:41, Jakub Jelinek wrote: > > On Sun, Nov 23, 2014 at 09:13:27AM +0800, Chen Gang wrote: > > [...] > > >> + else > >> + pp_wide_int(&pretty_name, > >> + wi::add (wi::to_widest (TYPE_MAX_VALUE (dom)), 1), > >> + TYPE_SIGN (TREE_TYPE (dom))); > > > > Space still missing before ( (and reindenting the following 2 lines). > > > > Oh, thanks, if necessary to send patch v4, please let me know. No, just fix it up before checking in. Jakub
On 11/24/14 15:41, Jakub Jelinek wrote: > On Sun, Nov 23, 2014 at 09:13:27AM +0800, Chen Gang wrote: [...] >> + else >> + pp_wide_int(&pretty_name, >> + wi::add (wi::to_widest (TYPE_MAX_VALUE (dom)), 1), >> + TYPE_SIGN (TREE_TYPE (dom))); > > Space still missing before ( (and reindenting the following 2 lines). > Oh, thanks, if necessary to send patch v4, please let me know. Thanks.
On 11/24/2014 04:24 PM, Jakub Jelinek wrote: > On Mon, Nov 24, 2014 at 04:28:10PM +0800, Chen Gang wrote: >> On 11/24/14 15:41, Jakub Jelinek wrote: >>> On Sun, Nov 23, 2014 at 09:13:27AM +0800, Chen Gang wrote: >> >> [...] >> >>>> + else >>>> + pp_wide_int(&pretty_name, >>>> + wi::add (wi::to_widest (TYPE_MAX_VALUE (dom)), 1), >>>> + TYPE_SIGN (TREE_TYPE (dom))); >>> >>> Space still missing before ( (and reindenting the following 2 lines). >>> >> >> Oh, thanks, if necessary to send patch v4, please let me know. > > No, just fix it up before checking in. > Hello Maintainers: At present, I don’t have write access yet nor is my paperwork compete, could someone help install it for me? Thanks.
On 01/22/15 06:15, Chen Gang S wrote: > On 11/24/2014 04:24 PM, Jakub Jelinek wrote: >> On Mon, Nov 24, 2014 at 04:28:10PM +0800, Chen Gang wrote: >>> On 11/24/14 15:41, Jakub Jelinek wrote: >>>> On Sun, Nov 23, 2014 at 09:13:27AM +0800, Chen Gang wrote: >>> >>> [...] >>> >>>>> + else >>>>> + pp_wide_int(&pretty_name, >>>>> + wi::add (wi::to_widest (TYPE_MAX_VALUE (dom)), 1), >>>>> + TYPE_SIGN (TREE_TYPE (dom))); >>>> >>>> Space still missing before ( (and reindenting the following 2 lines). >>>> >>> >>> Oh, thanks, if necessary to send patch v4, please let me know. >> >> No, just fix it up before checking in. >> > > Hello Maintainers: > > At present, I don’t have write access yet nor is my paperwork compete, > could someone help install it for me? I fixed the formatting nit Jakub pointed out and installed the patch on your behalf. Thanks, Jeff
diff --git a/gcc/ubsan.c b/gcc/ubsan.c index b3d5343..3fceff7 100644 --- a/gcc/ubsan.c +++ b/gcc/ubsan.c @@ -369,7 +369,7 @@ ubsan_type_descriptor (tree type, enum ubsan_print_style pstyle) tree dtype = ubsan_get_type_descriptor_type (); tree type2 = type; const char *tname = NULL; - char *pretty_name; + pretty_printer pretty_name; unsigned char deref_depth = 0; unsigned short tkind, tinfo; @@ -408,54 +408,58 @@ ubsan_type_descriptor (tree type, enum ubsan_print_style pstyle) /* We weren't able to determine the type name. */ tname = "<unknown>"; - /* Decorate the type name with '', '*', "struct", or "union". */ - pretty_name = (char *) alloca (strlen (tname) + 16 + deref_depth); if (pstyle == UBSAN_PRINT_POINTER) { - int pos = sprintf (pretty_name, "'%s%s%s%s%s%s%s", - TYPE_VOLATILE (type2) ? "volatile " : "", - TYPE_READONLY (type2) ? "const " : "", - TYPE_RESTRICT (type2) ? "restrict " : "", - TYPE_ATOMIC (type2) ? "_Atomic " : "", - TREE_CODE (type2) == RECORD_TYPE - ? "struct " - : TREE_CODE (type2) == UNION_TYPE - ? "union " : "", tname, - deref_depth == 0 ? "" : " "); + pp_printf (&pretty_name, "'%s%s%s%s%s%s%s", + TYPE_VOLATILE (type2) ? "volatile " : "", + TYPE_READONLY (type2) ? "const " : "", + TYPE_RESTRICT (type2) ? "restrict " : "", + TYPE_ATOMIC (type2) ? "_Atomic " : "", + TREE_CODE (type2) == RECORD_TYPE + ? "struct " + : TREE_CODE (type2) == UNION_TYPE + ? "union " : "", tname, + deref_depth == 0 ? "" : " "); while (deref_depth-- > 0) - pretty_name[pos++] = '*'; - pretty_name[pos++] = '\''; - pretty_name[pos] = '\0'; + pp_star (&pretty_name); + pp_quote (&pretty_name); } else if (pstyle == UBSAN_PRINT_ARRAY) { /* Pretty print the array dimensions. */ gcc_assert (TREE_CODE (type) == ARRAY_TYPE); tree t = type; - int pos = sprintf (pretty_name, "'%s ", tname); + pp_printf (&pretty_name, "'%s ", tname); while (deref_depth-- > 0) - pretty_name[pos++] = '*'; + pp_star (&pretty_name); while (TREE_CODE (t) == ARRAY_TYPE) { - pretty_name[pos++] = '['; + pp_left_bracket (&pretty_name); tree dom = TYPE_DOMAIN (t); if (dom && TREE_CODE (TYPE_MAX_VALUE (dom)) == INTEGER_CST) - pos += sprintf (&pretty_name[pos], HOST_WIDE_INT_PRINT_DEC, + { + if (tree_fits_uhwi_p (TYPE_MAX_VALUE (dom)) + && tree_to_uhwi (TYPE_MAX_VALUE (dom)) + 1 != 0) + pp_printf (&pretty_name, HOST_WIDE_INT_PRINT_DEC, tree_to_uhwi (TYPE_MAX_VALUE (dom)) + 1); + else + pp_wide_int(&pretty_name, + wi::add (wi::to_widest (TYPE_MAX_VALUE (dom)), 1), + TYPE_SIGN (TREE_TYPE (dom))); + } else /* ??? We can't determine the variable name; print VLA unspec. */ - pretty_name[pos++] = '*'; - pretty_name[pos++] = ']'; + pp_star (&pretty_name); + pp_right_bracket (&pretty_name); t = TREE_TYPE (t); } - pretty_name[pos++] = '\''; - pretty_name[pos] = '\0'; + pp_quote (&pretty_name); - /* Save the tree with stripped types. */ - type = t; + /* Save the tree with stripped types. */ + type = t; } else - sprintf (pretty_name, "'%s'", tname); + pp_printf (&pretty_name, "'%s'", tname); switch (TREE_CODE (type)) { @@ -492,8 +496,9 @@ ubsan_type_descriptor (tree type, enum ubsan_print_style pstyle) DECL_IGNORED_P (decl) = 1; DECL_EXTERNAL (decl) = 0; - size_t len = strlen (pretty_name); - tree str = build_string (len + 1, pretty_name); + const char *tmp = pp_formatted_text (&pretty_name); + size_t len = strlen (tmp); + tree str = build_string (len + 1, tmp); TREE_TYPE (str) = build_array_type (char_type_node, build_index_type (size_int (len))); TREE_READONLY (str) = 1;