Skip to content

[clang-tidy] Fix broken fix-its with bugprone-not-null-terminated-result on Windows #162874

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
wants to merge 2 commits into
base: main
Choose a base branch
from
+7 −14
Open

[clang-tidy] Fix broken fix-its with bugprone-not-null-terminated-result on Windows #162874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9eb6d8
[clang-tidy] Fix broken fix-its with `bugprone-not-null-terminated-re…
localspook Oct 10, 2025
ec37008
Double backticks for code snippets
localspook Oct 10, 2025
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
7 changes: 3 additions & 4 deletions clang-tools-extra/clang-tidy/bugprone/NotNullTerminatedResultCheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,10 +307,9 @@ static void lengthExprHandle(const Expr *LengthExpr,
// Try to obtain an 'IntegerLiteral' and adjust it.
if (!IsMacroDefinition) {
if (const auto *LengthIL = dyn_cast<IntegerLiteral>(LengthExpr)) {
size_t NewLength = LengthIL->getValue().getZExtValue() +
(LengthHandle == LengthHandleKind::Increase
? (isInjectUL(Result) ? 1UL : 1)
: -1);
uint64_t NewLength =
LengthIL->getValue().getZExtValue() +
(LengthHandle == LengthHandleKind::Increase ? 1 : -1);

const auto NewLengthFix = FixItHint::CreateReplacement(
LengthIL->getSourceRange(),
Expand Down
4 changes: 4 additions & 0 deletions clang-tools-extra/docs/ReleaseNotes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,10 @@ Changes in existing checks
<clang-tidy/checks/bugprone/narrowing-conversions>` check by fixing
false positive from analysis of a conditional expression in C.

- Improved :doc:`bugprone-not-null-terminated-result
<clang-tidy/checks/bugprone/not-null-terminated-result>` check by fixing
bogus fix-its for ``strncmp`` and ``wcsncmp`` on Windows.

- Improved :doc:`bugprone-reserved-identifier
<clang-tidy/checks/bugprone/reserved-identifier>` check by ignoring
declarations and macros in system headers.
Expand Down
5 changes: 0 additions & 5 deletions clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-strlen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
// RUN: %check_clang_tidy --match-partial-fixes %s bugprone-not-null-terminated-result %t -- \
// RUN: -- -I %S/Inputs/not-null-terminated-result

// FIXME: Something wrong with the APInt un/signed conversion on Windows:
// in 'strncmp(str6, "string", 7);' it tries to inject '4294967302' as length.

// UNSUPPORTED: system-windows

#include "not-null-terminated-result-c.h"

#define __STDC_LIB_EXT1__ 1
Expand Down
5 changes: 0 additions & 5 deletions clang-tools-extra/test/clang-tidy/checkers/bugprone/not-null-terminated-result-wcslen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
// RUN: %check_clang_tidy --match-partial-fixes %s bugprone-not-null-terminated-result %t -- \
// RUN: -- -std=c++11 -I %S/Inputs/not-null-terminated-result

// FIXME: Something wrong with the APInt un/signed conversion on Windows:
// in 'wcsncmp(wcs6, L"string", 7);' it tries to inject '4294967302' as length.

// UNSUPPORTED: system-windows

#include "not-null-terminated-result-cxx.h"

#define __STDC_LIB_EXT1__ 1
Expand Down