Fix preprocessor guards for C99 format size specifiers #10020
Merged
+109
−9
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
bensze01
added
bug
needs-review
github-project-automation
bot
moved this to In Development
in Roadmap pull requests (new board)
gilles-peskine-arm
requested review from
minosgalanakis
and removed request for
mpg
bensze01
force-pushed
the
msvc-format-size-macros
branch
4 times, most recently
from
a8f4a16 to
7f1dfaa
Compare
bensze01
force-pushed
the
msvc-format-size-macros
branch
4 times, most recently
from
37793b4 to
5fbffa2
Compare
Contributor
|
I tried cherry-picking 81ea6a6 in the branch (based on 3.6) where I originally uncovered the issue. It fixed the windows -cmake tests but broke the the windows -shipped tests with lots of compile errors like: I can see that the windows -shipped tests are passing here, so perhaps I didn't cherry-pick correctly, or the problem I'm observing is specific to 3.6? (Unrelated: this is labeled "needs preceding PR" but I can't see a link to the preceding PR it needs in the description.) |
Contributor
Author
Contributor
|
Ok, thanks. |
Contributor
|
@bensze01 How is this progressing? This is needed for the TLS defragmentation work which is the top priority for 3.6.3 and the code freeze is next Friday (14 Mar) - hard deadline. If this can't be ready in time we can look for workarounds but we need to know. |
Contributor
Author
|
@mpg Sorry for the delay - it should be ready for review now. Will post the TF-PSA-Crypto pr in a moment. |
6 tasks
bensze01
force-pushed
the
msvc-format-size-macros
branch
2 times, most recently
from
28a9276 to
d656263
Compare
Signed-off-by: Bence Szépkúti <[email protected]>
The Windows CRT treats any invalid format specifiers passed to the CRT as fatal assertion failures. Disable thie behaviour temporarily while testing if the format specifiers we use are supported. Signed-off-by: Bence Szépkúti <[email protected]>
Visual Studio 2013 (_MSC_VER == 1800) doesn't support %zu - only use it on 2015 and above (_MSC_VER >= 1900). %ldd works on Visual Studio 2013, but this patch keeps the two macro definitions together, for simplicity's sake. Signed-off-by: Bence Szépkúti <[email protected]>
These headers were necessary for compatibility with Visual Studio 2010, and interfere with the system headers on Visual Studio 2013+, eg. when building Mbed TLS using the .sln file shipped with the project. Move the still-required definition of "inline" to callconv.h, where the definition for GCC also lives. Signed-off-by: Bence Szépkúti <[email protected]>
Signed-off-by: Bence Szépkúti <[email protected]>
Signed-off-by: Bence Szépkúti <[email protected]>
Signed-off-by: Bence Szépkúti <[email protected]>
Use a dummy definition of mbedtls_ms_time_t in builds without MBEDTLS_HAVE_TIME. Signed-off-by: Bence Szépkúti <[email protected]>
bensze01
force-pushed
the
msvc-format-size-macros
branch
from
2a63cac to
d2933f0
Compare
bensze01
added
needs-review
bensze01
force-pushed
the
msvc-format-size-macros
branch
from
d2933f0 to
d86ad8f
Compare
Signed-off-by: Bence Szépkúti <[email protected]>
bensze01
force-pushed
the
msvc-format-size-macros
branch
from
d86ad8f to
24f11a3
Compare
gilles-peskine-arm
approved these changes
Mar 12, 2025
Contributor
gilles-peskine-arm
left a comment
gilles-peskine-arm
left a comment
There was a problem hiding this comment.
Thanks for simplifying the test data. LGTM
minosgalanakis
added
approved
github-project-automation
bot
moved this from In Development
to Has Approval
in Roadmap pull requests (new board)
github-project-automation
bot
moved this from Has Approval
to Done
in Roadmap pull requests (new board)
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Description
This PR fixes the preprocessor guards protecting the use of
%zuinMBEDTLS_PRINTF_SIZETIt also adds a non-regression test to
test_suite_debug.Fixes #10017
Unblocks #9976
PR checklist