mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-25 05:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR pch/68758 (Invalid read of size 8 in gt_pch_save (ggc-common.c:551))

Browse Source 
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
This commit is contained in:
Martin Liska 2016-01-28 09:39:05 +01:00 committed by Martin Liska
parent 9a175e65bd
commit c132770ebf
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -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

8
gcc/ggc-common.c
View File

@ -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