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

class.c (resort_type_method_vec): Avoid potential unsigned overflow.

Browse source 
* class.c (resort_type_method_vec): Avoid potential unsigned
	overflow.

From-SVN: r249265
This commit is contained in:
Nathan Sidwell 2017-06-16 14:49:35 +00:00 • committed by Nathan Sidwell
parent 0d1dc5862f
commit ba27a39d37
2 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gcc/cp/ChangeLog
View file

@ -1,5 +1,8 @@
2017-06-16 Nathan Sidwell <nathan@acm.org>
* class.c (resort_type_method_vec): Avoid potential unsigned
overflow.
Don't defer noexcept_deferred_spec.
* cp-tree.h (unevaluated_noexcept_spec): Don't declare.
* decl.c (cxx_init_decl_processing): Initialize

36
gcc/cp/class.c
View file

@ -2328,25 +2328,25 @@ resort_type_method_vec (void* obj,
gt_pointer_operator new_value,
void* cookie)
{
vec<tree, va_gc> *method_vec = (vec<tree, va_gc> *) obj;
int len = vec_safe_length (method_vec);
size_t slot;
tree fn;
/* The type conversion ops have to live at the front of the vec, so we
can't sort them. */
for (slot = CLASSTYPE_FIRST_CONVERSION_SLOT;
vec_safe_iterate (method_vec, slot, &fn);
++slot)
if (!DECL_CONV_FN_P (OVL_FIRST (fn)))
break;
if (len - slot > 1)
if (vec<tree, va_gc> *method_vec = (vec<tree, va_gc> *) obj)
{
resort_data.new_value = new_value;
resort_data.cookie = cookie;
qsort (method_vec->address () + slot, len - slot, sizeof (tree),
resort_method_name_cmp);
int len = method_vec->length ();
int slot;
/* The type conversion ops have to live at the front of the vec, so we
can't sort them. */
for (slot = CLASSTYPE_FIRST_CONVERSION_SLOT;
slot < len; slot++)
if (!DECL_CONV_FN_P (OVL_FIRST ((*method_vec)[slot])))
break;
if (len > slot + 1)
{
resort_data.new_value = new_value;
resort_data.cookie = cookie;
qsort (method_vec->address () + slot, len - slot, sizeof (tree),
resort_method_name_cmp);
}
}
}