Skip to content

gh-112301: Add -Wformat=2 compiler option to NODIST#122474

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.

Sign up for GitHub

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

Open
nohlson wants to merge 20 commits into
base:main
Choose a base branch
from
Open

gh-112301: Add -Wformat=2 compiler option to NODIST #122474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c5396a1
Add -Wformat=2 compiler option to NODIST default
nohlson Jul 30, 2024
19437ef
Add -Wformat to NODIST
nohlson Jul 30, 2024
cba84fe
📜🤖 Added by blurb_it.
blurb-it[bot] Jul 30, 2024
178bcc6
Add fail on warning regression option to ubuntu builds
nohlson Jul 30, 2024
3bc76ca
Add warning ignores to code with nonliteral format strings
nohlson Aug 5, 2024
c4b8cf9
Limit pragmas to gcc/clang
nohlson Aug 5, 2024
8cff32e
Refactor version _Py_InitVersion to use format string literals
nohlson Aug 7, 2024
95c612c
Merge branch 'main' into add-format-level-2
nohlson Sep 18, 2024
a3b0c46
Create pyport preprocessor macro for ignoring format nonliterals
nohlson Sep 18, 2024
fa52862
Add MSVC boilerplate macro for ignoring format nonliteral
nohlson Sep 18, 2024
6cd1def
Add nonliteral macro
nohlson Sep 18, 2024
13e9c80
Merge branch 'main' into add-format-level-2
nohlson Sep 24, 2024
b62d155
Merge branch 'main' into add-format-level-2
nohlson Sep 30, 2024
9806f88
Merge main
nohlson Sep 30, 2024
88fbc65
Pull unicodeobject changes
nohlson Sep 30, 2024
b6db214
Merge branch 'main' into add-format-level-2
nohlson Oct 8, 2024
304aed1
Update macos warningignore for new warnings
nohlson Oct 8, 2024
5afb8d8
Fix mimalloc directory warning ignore
nohlson Oct 8, 2024
1e664f6
Revert pyport
nohlson Oct 8, 2024
1b4089b
Formatting nit
erlend-aasland Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Security/2024-07-30-17-34-47.gh-issue-112301.8J8WhZ.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
Add ``-Wformat=2`` to ``NODIST`` build flags to warn about potential vulnerabilities related to format strings.
8 changes: 4 additions & 4 deletions Python/getversion.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,12 +15,12 @@ void _Py_InitVersion(void)
}
initialized = 1;
#ifdef Py_GIL_DISABLED
const char *buildinfo_format = "%.80s experimental free-threading build (%.80s) %.80s"
PyOS_snprintf(version, sizeof(version), "%.80s experimental free-threading build (%.80s) %.80s",
PY_VERSION, Py_GetBuildInfo(), Py_GetCompiler());
#else
const char *buildinfo_format = "%.80s (%.80s) %.80s"
#endif
PyOS_snprintf(version, sizeof(version), buildinfo_format,
PyOS_snprintf(version, sizeof(version), "%.80s (%.80s) %.80s",
PY_VERSION, Py_GetBuildInfo(), Py_GetCompiler());
#endif
}

const char *
Expand Down
6 changes: 6 additions & 0 deletions Tools/build/.warningignore_macos
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,13 @@
# Keep lines sorted lexicographically to help avoid merge conflicts.
# Format example:
# /path/to/file (number of warnings in file)
Modules/_ctypes/_ctypes_test.c 1
Modules/_ctypes/callbacks.c 1
Modules/expat/siphash.h 7
Modules/expat/xmlparse.c 8
Modules/expat/xmltok.c 3
Modules/expat/xmltok_impl.c 26
Objects/mimalloc/ *
Python/pylifecycle.c 1
Python/sysmodule.c 1
Python/tracemalloc.c 1
Copy link
Contributor

@erlend-aaslanderlend-aaslandOct 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: can you please add the missing newline at EOF?

39 changes: 39 additions & 0 deletions configure
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions configure.ac
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2514,6 +2514,7 @@ if test "$enable_safety" = "yes"
then
AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [CFLAGS_NODIST="$CFLAGS_NODIST -fstack-protector-strong"], [AC_MSG_WARN([-fstack-protector-strong not supported])], [-Werror])
AX_CHECK_COMPILE_FLAG([-Wtrampolines], [CFLAGS_NODIST="$CFLAGS_NODIST -Wtrampolines"], [AC_MSG_WARN([-Wtrampolines not supported])], [-Werror])
AX_CHECK_COMPILE_FLAG([-Wformat -Wformat=2], [CFLAGS_NODIST="$CFLAGS_NODIST -Wformat -Wformat=2"], [AC_MSG_WARN([-Wformat and -Wformat=2 not supported])], [-Werror])
AX_CHECK_COMPILE_FLAG([-Wimplicit-fallthrough], [CFLAGS_NODIST="$CFLAGS_NODIST -Wimplicit-fallthrough"], [AC_MSG_WARN([-Wimplicit-fallthrough not supported])], [-Werror])
AX_CHECK_COMPILE_FLAG([-Werror=format-security], [CFLAGS_NODIST="$CFLAGS_NODIST -Werror=format-security"], [AC_MSG_WARN([-Werror=format-security not supported])], [-Werror])
AX_CHECK_COMPILE_FLAG([-Wbidi-chars=any], [CFLAGS_NODIST="$CFLAGS_NODIST -Wbidi-chars=any"], [AC_MSG_WARN([-Wbidi-chars=any not supported])], [-Werror])
Expand Down