-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Handle dlopen(NULL) failure in glibc fallback #12716
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+16
−2
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
Handle dlopen(NULL) failure in glibc fallback
- Loading branch information
commit 2f13f99e69c5f985bd255912f115a2afea573d4f
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,7 +40,20 @@ def glibc_version_string_ctypes() -> Optional[str]: | |
| # manpage says, "If filename is NULL, then the returned handle is for the | ||
| # main program". This way we can let the linker do the work to figure out | ||
| # which libc our process is actually using. | ||
| process_namespace = ctypes.CDLL(None) | ||
| # | ||
| # We must also handle the special case where the executable is not a | ||
| # dynamically linked executable. This can occur when using musl libc, | ||
| # for example. In this situation, dlopen() will error, leading to an | ||
| # OSError. Interestingly, at least in the case of musl, there is no | ||
| # errno set on the OSError. The single string argument used to construct | ||
| # OSError comes from libc itself and is therefore not portable to | ||
| # hard code here. In any case, failure to call dlopen() means we | ||
| # can proceed, so we bail on our attempt. | ||
| try: | ||
| process_namespace = ctypes.CDLL(None) | ||
| except OSError: | ||
| return None | ||
|
|
||
| try: | ||
| gnu_get_libc_version = process_namespace.gnu_get_libc_version | ||
| except AttributeError: | ||
|
|
@@ -50,7 +63,7 @@ def glibc_version_string_ctypes() -> Optional[str]: | |
|
|
||
| # Call gnu_get_libc_version, which returns a string like "2.5" | ||
| gnu_get_libc_version.restype = ctypes.c_char_p | ||
| version_str = gnu_get_libc_version() | ||
| version_str: str = gnu_get_libc_version() | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I just copied over the full |
||
| # py2 / py3 compatibility: | ||
| if not isinstance(version_str, str): | ||
| version_str = version_str.decode("ascii") | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.