std::dynamic_lib: Fix Windows error handling #20874
Merged
Conversation
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
|
r? @huonw (rust_highfive has picked a reviewer for you, use r? to override) |
klutzy
force-pushed
the
windows-dynamic-lib
branch
2 times, most recently
from
e2ec01b to
4fc7861
Compare
| // beware: Vec/String may change errno during drop! | ||
| // so we get error here. | ||
| if result == ptr::null_mut() { | ||
| Err(format!("Error code {}", os::errno())) |
There was a problem hiding this comment.
While you're at it, could this get a beefed up error message with the error description as well as the error code?
klutzy
force-pushed
the
windows-dynamic-lib
branch
from
4fc7861 to
4f5770e
Compare
|
Now it uses |
klutzy
force-pushed
the
windows-dynamic-lib
branch
from
216b3eb to
65d06c4
Compare
This is a [breaking-change] since `std::dynamic_lib::dl` is now private. When `LoadLibraryW()` fails, original code called `errno()` to get error code. However, there was local allocation of `Vec` before `LoadLibraryW()`, and it drops before `errno()`, and the drop (deallocation) changed `errno`! Therefore `dynamic_lib::open()` thought it always succeeded. This commit fixes the issue. This commit also sets Windows error mode during `LoadLibrary()` to prevent "dll load failed" dialog.
klutzy
force-pushed
the
windows-dynamic-lib
branch
from
65d06c4 to
d053ccb
Compare
|
Fixed |
|
⌛ Testing commit d053ccb with merge 658e0bd... |
|
@bors: retry |
|
⌛ Testing commit d053ccb with merge 6f161d7... |
|
💔 Test failed - auto-bsd-64-opt |
|
@bors: retry |
bors
added a commit
that referenced
this pull request
Jan 19, 2015
This is a [breaking-change] since `std::dynamic_lib::dl` is now private. When `LoadLibraryW()` fails, original code called `errno()` to get error code. However, there was local allocation of `Vec` before `LoadLibraryW()`, and it drops before `errno()`, and the drop (deallocation) changed `errno`! Therefore `dynamic_lib::open()` thought it always succeeded. This commit fixes the issue. This commit also sets Windows error mode during `LoadLibrary()` to prevent "dll load failed" dialog.
|
💔 Test failed - auto-mac-64-nopt-t |
bors
added a commit
that referenced
this pull request
Jan 19, 2015
This is a [breaking-change] since `std::dynamic_lib::dl` is now private. When `LoadLibraryW()` fails, original code called `errno()` to get error code. However, there was local allocation of `Vec` before `LoadLibraryW()`, and it drops before `errno()`, and the drop (deallocation) changed `errno`! Therefore `dynamic_lib::open()` thought it always succeeded. This commit fixes the issue. This commit also sets Windows error mode during `LoadLibrary()` to prevent "dll load failed" dialog.
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.
This is a [breaking-change] since
std::dynamic_lib::dlis nowprivate.
When
LoadLibraryW()fails, original code callederrno()to get errorcode. However, there was local allocation of
VecbeforeLoadLibraryW(), and it drops beforeerrno(), and the drop(deallocation) changed
errno! Thereforedynamic_lib::open()thoughtit always succeeded.
This commit fixes the issue.
This commit also sets Windows error mode during
LoadLibrary()toprevent "dll load failed" dialog.