From 3bb7255849274456ee7c8370973b2d6ef72abe0e Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@fedoraproject.org>
Date: Apr 12 2018 20:00:20 +0000
Subject: 3.13.0-18 - Add valgrind-3.13.0-build-id-phdrs.patch (#1566639)


---

diff --git a/valgrind-3.13.0-build-id-phdrs.patch b/valgrind-3.13.0-build-id-phdrs.patch
new file mode 100644
index 0000000..6a0a9df
--- /dev/null
+++ b/valgrind-3.13.0-build-id-phdrs.patch
@@ -0,0 +1,17 @@
+diff --git a/coregrind/m_debuginfo/readelf.c b/coregrind/m_debuginfo/readelf.c
+index 70c28e629..8bd3e049c 100644
+--- a/coregrind/m_debuginfo/readelf.c
++++ b/coregrind/m_debuginfo/readelf.c
+@@ -1137,7 +1137,11 @@ HChar* find_buildid(DiImage* img, Bool rel_ok, Bool search_shdrs)
+ 
+       ElfXX_Ehdr ehdr;
+       ML_(img_get)(&ehdr, img, 0, sizeof(ehdr));
+-      for (i = 0; i < ehdr.e_phnum; i++) {
++      /* Skip the phdrs when we have to search the shdrs. In separate
++         .debug files the phdrs might not be valid (they are a copy of
++         the main ELF file) and might trigger assertions when getting
++	 image notes based on them. */
++      for (i = 0; !search_shdrs && i < ehdr.e_phnum; i++) {
+          ElfXX_Phdr phdr;
+          ML_(img_get)(&phdr, img,
+                       ehdr.e_phoff + i * ehdr.e_phentsize, sizeof(phdr));
diff --git a/valgrind.spec b/valgrind.spec
index 3fb0e9e..afeb669 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.13.0
-Release: 17%{?dist}
+Release: 18%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -169,6 +169,9 @@ Patch19: valgrind-3.13.0-s390-cgijnl.patch
 # KDE#391164 constraint bug in tests/ppc64/test_isa_2_07_part1.c for mtfprwa
 Patch20: valgrind-3.13.0-ppc64-mtfprwa-constraint.patch
 
+# KDE#393062 Reading build-id ELF note "debuginfo reader: ensure_valid failed"
+Patch21: valgrind-3.13.0-build-id-phdrs.patch
+
 %if %{build_multilib}
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
@@ -312,6 +315,7 @@ Valgrind User Manual for details.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 %build
 # We need to use the software collection compiler and binutils if available.
@@ -542,6 +546,9 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
+* Thu Apr 12 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.13.0-18
+- Add valgrind-3.13.0-build-id-phdrs.patch (#1566639)
+
 * Tue Feb 27 2018 Mark Wielaard <mjw@fedoraproject.org> - 3.13.0-17
 - Add valgrind-3.13.0-ppc64-mtfprwa-constraint.patch.