stdenv: Improve ELF detection for isELF #47244
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aszlig
commented
Sep 23, 2018
pkgs/stdenv/generic/setup.sh
Outdated
| @@ -211,7 +211,7 @@ isELF() { | |||
| exec {fd}< "$fn" | |||
| read -r -n 4 -u "$fd" magic | |||
| exec {fd}<&- | |||
| if [[ "$magic" =~ ELF ]]; then return 0; else return 1; fi | |||
| if [ "$magic" = 'ELF' ]; then return 0; else return 1; fi | |||
There was a problem hiding this comment.
Note that there is a 0x7F character here, GitHub just doesn't show it.
There was a problem hiding this comment.
Hm, I'll probably change this to $'\177ELF.
|
Failure on x86_64-darwin (full log) Attempted: stdenv Partial log (click to expand)
|
The isELF function only checks whether ELF is contained within the first 4 bytes of the file, which is a bit fuzzy and will also return successful if it's a text file starting with ELF, for example: ELF headers ----------- Some text here about ELF headers... So instead, we're now doing a precise match on \x7fELF. Signed-off-by: aszlig <aszlig@nix.build>
aszlig
force-pushed
the
better-iself
branch
from
c6d5923
to
944379a
Compare
|
Timed out, unknown build status on x86_64-linux (full log) Attempted: stdenv Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Attempted: stdenv Partial log (click to expand)
|
|
Is there something that motivated this? Just curious, especially since this and #47249 were submitted so close to each other. |
|
Timed out, unknown build status on x86_64-linux (full log) Attempted: stdenv Partial log (click to expand)
|
9 tasks
|
Timed out, unknown build status on aarch64-linux (full log) Attempted: stdenv Partial log (click to expand)
|
aszlig
added a commit
that referenced
this pull request
Sep 25, 2018
The isELF function only checks whether ELF is contained within the first 4 bytes of the file, which is a bit fuzzy and will also return successful if it's a text file starting with ELF, for example: ELF headers ----------- Some text here about ELF headers... So instead, we're now doing a precise match on \x7fELF. Signed-off-by: aszlig <aszlig@nix.build> Acked-by: @Ericson2314 Closes: #47244
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The isELF function only checks whether ELF is contained within the first 4 bytes of the file, which is a bit fuzzy and will also return successful if it's a text file starting with ELF, for example:
So instead, we're now doing a precise match on
\x7fELF.