zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When replacing path text in ELF binaries do not include null byte padding in search string (#15508)

Browse Source
This commit is contained in:
Patrick Gartung 2020-03-16 14:49:55 -05:00 committed by GitHub
parent a8706cc89b
commit 3029dde7ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/spack/spack/relocate.py
View File

@ -447,7 +447,7 @@ def replace(match):
data = f.read() data = f.read()
f.seek(0) f.seek(0)
original_data_len = len(data) original_data_len = len(data)
pat = re.compile(old_dir.encode('utf-8') + b'([^\0]*?)\0') pat = re.compile(old_dir.encode('utf-8'))
if not pat.search(data): if not pat.search(data):
return return
ndata = pat.sub(replace, data) ndata = pat.sub(replace, data)