gcov-tool: Do not segfault in merge operation (PR

PR gcov-profile/67097 * libgcov-util.c (gcov_profile_merge): Skip missing files. From-SVN: r239478

gcov-tool: Do not segfault in merge operation (PR
PR gcov-profile/67097 * libgcov-util.c (gcov_profile_merge): Skip missing files. From-SVN: r239478
2e6fc1ac · Gilles Gouaillardet · Martin Liska · 38359141 · 2e6fc1ac · 2e6fc1ac
Commit 2e6fc1ac authored 8 years ago by Gilles Gouaillardet Committed by Martin Liska 8 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

libgcc/ChangeLog
+5 -0

libgcc/libgcov-util.c
+1 -0

No files found.
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
+2016-08-15  Gilles Gouaillardet  <gilles.gouaillardet@gmail.com>
+
+	PR gcov-profile/67097
+	* libgcov-util.c (gcov_profile_merge): Skip missing files.
+
 2016-08-10  Martin Liska  <mliska@suse.cz>

 	PR gcov-profile/58306

--- a/libgcc/libgcov-util.c
+++ b/libgcc/libgcov-util.c
@@ -673,6 +673,7 @@ gcov_profile_merge (struct gcov_info *tgt_profile, struct gcov_info *src_profile
    {
      gi_ptr = in_src_not_tgt[i];
      gcov_merge (gi_ptr, gi_ptr, w2 - 1);
+      gi_ptr->next = NULL;
      tgt_tail->next = gi_ptr;
      tgt_tail = gi_ptr;
    }