diff mbox

gcov-tool: Do not segfault in merge operation (PR, gcov-profile/67097).

Message ID 0df5a3b1-4608-58b5-add8-c8e0e442ec4e@suse.cz
State New
Headers show

Commit Message

Martin Liška Aug. 8, 2016, 2:16 p.m. UTC 
Hi.

Following simple patch is a fix for $subject.

Ready for trunk?
Martin

Comments

Martin Liška Aug. 15, 2016, 11:23 a.m. UTC | #1 
On 08/08/2016 04:16 PM, Martin Liška wrote:
> Hi.
> 
> Following simple patch is a fix for $subject.
> 
> Ready for trunk?
> Martin
> 

Patch has been approved on IRC, installed as r239478.

Martin
diff mbox

Patch

From 936e45b384f30f560cacafb7bb6ed9968e4faa96 Mon Sep 17 00:00:00 2001
From: marxin <mliska@suse.cz>
Date: Mon, 8 Aug 2016 16:09:06 +0200
Subject: [PATCH] gcov-tool: Do not segfault in merge operation (PR
 gcov-profile/67097).

libgcc/ChangeLog:

2016-08-08  Gilles Gouaillardet  <gilles.gouaillardet@gmail.com>

	* libgcov-util.c (gcov_profile_merge): Skip missing files.
---
 libgcc/libgcov-util.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libgcc/libgcov-util.c b/libgcc/libgcov-util.c
index 7b3bc31..df3672e 100644
--- 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;
     }
-- 
2.9.2