sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

verify-elf: don't call verify_rpath() under a pipe because the errors are saved in a var

Browse Source 
(A pipe makes a subshell and the var is modified there.)
This commit is contained in:
Ivan Zakharyaschev
2016-11-30 17:22:40 +03:00
parent c0f11587a5
commit 00b00565ea
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/verify-elf.in
View File

@ -363,12 +363,12 @@ VerifyELF()
error_normal LINT "$f" 'eu-elflint failed' error_normal LINT "$f" 'eu-elflint failed'
fi fi
printf %s "$objdump_info" |awk '($1=="RPATH"||$1=="RUNPATH"){print $2}' | local rpath
while read -r rpath; do while read -r rpath; do
verify_rpath "$f" "$rpath" verify_rpath "$f" "$rpath"
# Two RUNPATH/RPATHs are reported; verify_rpath() always prints at least: # Two RUNPATH/RPATHs are reported; verify_rpath() always prints at least:
# error_strict RPATH "$f" "RPATH entry found: $rpath" # error_strict RPATH "$f" "RPATH entry found: $rpath"
done done <<<"$(printf %s "$objdump_info" |awk '($1=="RPATH"||$1=="RUNPATH"){print $2}')"
if [ -z "${t##*ELF* executable*}" -o -z "${t##*ELF* shared object*}" ]; then if [ -z "${t##*ELF* executable*}" -o -z "${t##*ELF* shared object*}" ]; then
verify_stack "$f" verify_stack "$f"
@ -381,7 +381,6 @@ VerifyELF()
fi fi
if [ -z "${t##*ELF* executable*dynamically linked*}" -o -z "${t##*ELF* shared object*}" ]; then if [ -z "${t##*ELF* executable*dynamically linked*}" -o -z "${t##*ELF* shared object*}" ]; then
local rpath
rpath="$(printf %s "$objdump_info" |awk '($1=="RUNPATH"){print $2}' |tr -s : ' ' |sed -e "s|\$ORIGIN|${fname%/*}|g")" rpath="$(printf %s "$objdump_info" |awk '($1=="RUNPATH"){print $2}' |tr -s : ' ' |sed -e "s|\$ORIGIN|${fname%/*}|g")"
if [ -z "$rpath" ]; then if [ -z "$rpath" ]; then
rpath="$(printf %s "$objdump_info" |awk '($1=="RPATH"){print $2}' |tr -s : ' ' |sed -e "s|\$ORIGIN|${fname%/*}|g")" rpath="$(printf %s "$objdump_info" |awk '($1=="RPATH"){print $2}' |tr -s : ' ' |sed -e "s|\$ORIGIN|${fname%/*}|g")"