aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/vec.h14
2 files changed, 16 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fcb9410..3ebbc1c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-15 Martin Sebor <msebor@redhat.com>
+
+ PR bootstrap/78817
+ * vec.h (vec<T, va_heap, vl_ptr>::safe_grow_cleared): Assert
+ a pointer is non-null.
+
2016-12-15 Andrew Senkevich <andrew.senkevich@intel.com>
* config/i386/avx512bwintrin.h: Add new k-mask intrinsics.
diff --git a/gcc/vec.h b/gcc/vec.h
index aa93411..3877f2d 100644
--- a/gcc/vec.h
+++ b/gcc/vec.h
@@ -1607,10 +1607,16 @@ inline void
vec<T, va_heap, vl_ptr>::safe_grow_cleared (unsigned len MEM_STAT_DECL)
{
unsigned oldlen = length ();
- size_t sz = sizeof (T) * (len - oldlen);
- safe_grow (len PASS_MEM_STAT);
- if (sz != 0)
- memset (&(address ()[oldlen]), 0, sz);
+ gcc_checking_assert (oldlen <= len);
+
+ if (size_t sz = sizeof (T) * (len - oldlen))
+ {
+ safe_grow (len PASS_MEM_STAT);
+
+ T *p = address ();
+ gcc_assert (p != NULL);
+ memset (p + oldlen, 0, sz);
+ }
}