Use snprintf instead of _snprintf on Windows #373
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
_snprintf does not guarantee null termination if the size argument is too small. Starting with VS2015, the UCRT provides a C99-compliant snprintf. Use it, and also fix a related issue where _dispatch_client_assert_fail was passing a too-small size.
compnerd
reviewed
Jun 22, 2018
| @@ -928,7 +928,7 @@ _dispatch_ktrace_impl(uint32_t code, uint64_t a, uint64_t b, | |||
| dispatch_assert(_length != -1); \ | |||
| _msg = (char *)malloc((unsigned)_length + 1); \ | |||
| dispatch_assert(_msg); \ | |||
| _snprintf(_msg, (unsigned)_length, "%s" fmt, DISPATCH_ASSERTION_FAILED_MESSAGE, ##__VA_ARGS__); \ | |||
| snprintf(_msg, (unsigned)_length + 1, "%s" fmt, DISPATCH_ASSERTION_FAILED_MESSAGE, ##__VA_ARGS__); \ | |||
There was a problem hiding this comment.
Bleh; too bad that we still have the _scprintf here. Can we use snprintf with a 0 size instead to get the desired length? Then we could just use this version globally rather than having a windows only path. The difference between the asprintf version and this would be the extra calls, but it is on the abort path anyways, so I don't think that it matters too much.
There was a problem hiding this comment.
Yeah, I agree this is kinda nasty - is it fine if I make that change as a follow-up?
asprintf is also used in several places in test code :(
MadCoder
approved these changes
Jun 23, 2018
|
@swift-ci please test |
|
ping @MadCoder |
ktopley-apple
pushed a commit
that referenced
this pull request
Dec 6, 2018
Use snprintf instead of _snprintf on Windows Signed-off-by: Kim Topley <ktopley@apple.com>
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.
_snprintf does not guarantee null termination if the size argument is too small.
Starting with VS2015, the UCRT provides a C99-compliant snprintf. Use it, and
also fix a related issue where _dispatch_client_assert_fail was passing a
too-small size.