diff options
| author | Martin Liska <mliska@suse.cz> | 2016-01-28 09:39:05 +0100 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2016-01-28 08:39:05 +0000 |
| commit | c132770ebfe92cfab34a79811022437dae051c3b (patch) | |
| tree | 00dcb34aea10f023c051e5fc1127745486ce61f5 /gcc | |
| parent | 9a175e65bd7c73810ec6de0dcf670309b2ef4d7c (diff) | |
| download | gcc-c132770ebfe92cfab34a79811022437dae051c3b.zip gcc-c132770ebfe92cfab34a79811022437dae051c3b.tar.gz gcc-c132770ebfe92cfab34a79811022437dae051c3b.tar.bz2 | |
re PR pch/68758 (Invalid read of size 8 in gt_pch_save (ggc-common.c:551))
Fix PR pch/68758.
PR pch/68758
* ggc-common.c (gt_pch_save): Use ENABLE_VALGRIND_ANNOTATIONS macro
instead of ENABLE_VALGRIND_CHECKING.
From-SVN: r232915
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/ggc-common.c | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4107546..c1d8faf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-01-28 Martin Liska <mliska@suse.cz> + + PR pch/68758 + * ggc-common.c (gt_pch_save): Use ENABLE_VALGRIND_ANNOTATIONS macro + instead of ENABLE_VALGRIND_CHECKING. + 2016-01-27 Richard Henderson <rth@redhat.com> PR rtl-opt/69447 diff --git a/gcc/ggc-common.c b/gcc/ggc-common.c index c919ba8..9b291aa 100644 --- a/gcc/ggc-common.c +++ b/gcc/ggc-common.c @@ -492,7 +492,7 @@ gt_pch_save (FILE *f) ggc_pch_prepare_write (state.d, state.f); -#if defined ENABLE_VALGRIND_CHECKING && defined VALGRIND_GET_VBITS +#if defined ENABLE_VALGRIND_ANNOTATIONS && defined VALGRIND_GET_VBITS vec<char> vbits = vNULL; #endif @@ -504,7 +504,7 @@ gt_pch_save (FILE *f) this_object_size = state.ptrs[i]->size; this_object = XRESIZEVAR (char, this_object, this_object_size); } -#if defined ENABLE_VALGRIND_CHECKING && defined VALGRIND_GET_VBITS +#if defined ENABLE_VALGRIND_ANNOTATIONS && defined VALGRIND_GET_VBITS /* obj might contain uninitialized bytes, e.g. in the trailing padding of the object. Avoid warnings by making the memory temporarily defined and then restoring previous state. */ @@ -561,7 +561,7 @@ gt_pch_save (FILE *f) state.ptrs[i]->note_ptr_fn == gt_pch_p_S); if (state.ptrs[i]->note_ptr_fn != gt_pch_p_S) memcpy (state.ptrs[i]->obj, this_object, state.ptrs[i]->size); -#if defined ENABLE_VALGRIND_CHECKING && defined VALGRIND_GET_VBITS +#if defined ENABLE_VALGRIND_ANNOTATIONS && defined VALGRIND_GET_VBITS if (__builtin_expect (get_vbits == 1, 0)) { (void) VALGRIND_SET_VBITS (state.ptrs[i]->obj, vbits.address (), @@ -575,7 +575,7 @@ gt_pch_save (FILE *f) } #endif } -#if defined ENABLE_VALGRIND_CHECKING && defined VALGRIND_GET_VBITS +#if defined ENABLE_VALGRIND_ANNOTATIONS && defined VALGRIND_GET_VBITS vbits.release (); #endif |