From 4341222c716a0b019365fc0b527088654a34634f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 04:57:02 +0000
Subject: import dyninst-9.3.1-2.el7


---

diff --git a/SOURCES/dyninst-rhbz1441810.patch b/SOURCES/dyninst-rhbz1441810.patch
new file mode 100644
index 0000000..603d97b
--- /dev/null
+++ b/SOURCES/dyninst-rhbz1441810.patch
@@ -0,0 +1,18 @@
+Fix for handling regions that have no disk backing
+
+--- dyninst-9.3.1/dyninstAPI/src/binaryEdit.h
++++ dyninst-9.3.1/dyninstAPI/src/binaryEdit.h
+@@ -258,8 +258,12 @@ class memoryTracker : public codeRange {
+     memoryTracker(Address a, unsigned s, void *b) :
+     alloced(false), dirty(false), a_(a), s_(s)
+         {
+-            b_ = malloc(s_);
+-            memcpy(b_, b, s_);
++            if(b) {
++                b_ = malloc(s_);
++                memcpy(b_, b, s_);
++            } else {
++                b_ = calloc(1, s_);
++            }
+         }
+     ~memoryTracker() { free(b_); }
diff --git a/SPECS/dyninst.spec b/SPECS/dyninst.spec
index af303a2..02a1b7b 100644
--- a/SPECS/dyninst.spec
+++ b/SPECS/dyninst.spec
@@ -2,7 +2,7 @@ Summary: An API for Run-time Code Generation
 License: LGPLv2+
 Name: dyninst
 Group: Development/Libraries
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.dyninst.org
 Version: 9.3.1
 # Dyninst only has full support for a few architectures.
@@ -16,6 +16,7 @@ Source1: https://github.com/dyninst/testsuite/archive/v9.3.0/testsuite-9.3.0.tar
 
 Patch1: testsuite-9.3.0-junit-nullptr.patch
 Patch2: dyninst-9.3.1-Address.patch
+Patch3: dyninst-rhbz1441810.patch
 
 %global dyninst_base dyninst-%{version}
 # Explicit version since it does not match the source version
@@ -90,6 +91,7 @@ making sure that dyninst works properly.
 
 %patch1 -p0 -b.nullptr
 %patch2 -p0 -b.Address
+%patch3 -p0 -b.1441810
 
 # cotire seems to cause non-deterministic gcc errors
 # https://bugzilla.redhat.com/show_bug.cgi?id=1420551
@@ -184,6 +186,9 @@ find %{buildroot}%{_libdir}/dyninst/testsuite/ \
 %attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a
 
 %changelog
+* Thu Jun 07 2018 Stan Cox <scox@redhat.com> - 9.3.1-2
+- rhbz1441810: Handle regions with no disk backing for ppc static instrumenting
+
 * Mon Mar 06 2017 Stan Cox <scox@redhat.com> - 9.3.1-1
 - Update to 9.3.1