Skip to content
This repository has been archived by the owner on Dec 3, 2019. It is now read-only.

Fix pyflame for code compiled with ld -z separate-code #170

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix pyflame for code compiled with ld -z separate-code #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c151d2f
Tag v1.6.7
eklitzke Jun 26, 2018
739a77d
Fix for code compiled with ld -z separate-code
Feb 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions NEWS.org
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
* NEWS (user visible changes)
** 1.6.7 (2018-06-25)
- Improved support for prelinked binaries, especially on ARM32 and Yocto
systems. (Andrew Jeffery)

** 1.6.6 (2018-05-02)

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AC_PREREQ([2.68])
AC_INIT([pyflame], [1.6.6], [[email protected]])
AC_INIT([pyflame], [1.6.7], [[email protected]])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([src/config.h])
AC_CONFIG_MACRO_DIR([m4])
Expand Down
3 changes: 1 addition & 2 deletions src/aslr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ size_t LocateLibPython(pid_t pid, const std::string &hint, std::string *path) {
std::string line;
std::string elf_path;
while (std::getline(fp, line)) {
if (line.find(hint) != std::string::npos &&
line.find(" r-xp ") != std::string::npos) {
if (line.find(hint) != std::string::npos) {
size_t pos = line.find('/');
if (pos == std::string::npos) {
throw FatalException("Did not find libpython absolute path");
Expand Down