Skip to content

Fix #14308 FP nullPointerRedundantCheck with pointer reference parameter (*&) #8014

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

Closed
chrchr-github wants to merge 6 commits into from
Closed

Fix #14308 FP nullPointerRedundantCheck with pointer reference parameter (*&) #8014

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
12726ff
Update valueflow.cpp
chrchr-github Dec 5, 2025
2129a66
Update testnullpointer.cpp
chrchr-github Dec 5, 2025
b2d34bf
Set flow direction
web-flow Dec 11, 2025
32ee464
Format
web-flow Dec 11, 2025
27282f2
Fix
web-flow Dec 11, 2025
f57a633
Reviewer comments
web-flow Dec 14, 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
6 changes: 6 additions & 0 deletions lib/valueflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5861,6 +5861,12 @@ static void valueFlowSubFunction(const TokenList& tokenlist,
continue;
}

if (argvar->isReference()) {
argvalues.remove_if([](const ValueFlow::Value& v) {
return v.isReverse();
});
}

if (argvalues.empty())
continue;

Expand Down
1 change: 1 addition & 0 deletions lib/vf_analyzers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1606,6 +1606,7 @@ ValuePtr<Analyzer> makeAnalyzer(const Token* exprTok, ValueFlow::Value value, co

ValuePtr<Analyzer> makeReverseAnalyzer(const Token* exprTok, ValueFlow::Value value, const Settings& settings)
{
value.setFlow(ValueFlow::Value::Flow::REVERSE);
if (value.isContainerSizeValue())
return ContainerExpressionAnalyzer(exprTok, std::move(value), settings);
return ExpressionAnalyzer(exprTok, std::move(value), settings);
Expand Down
14 changes: 13 additions & 1 deletion lib/vfvalue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,19 @@
};
UnknownFunctionReturn unknownFunctionReturn{UnknownFunctionReturn::no};

long long : 24; // padding
enum class Flow : std::uint8_t {
Comment thread
chrchr-github marked this conversation as resolved.
Outdated
UNKNOWN,
FORWARD,
REVERSE
} flow = Flow::UNKNOWN;
bool isReverse() const {
return flow == Flow::REVERSE;
}
void setFlow(Flow f) {
flow = f;
}

long long : 16; // padding
Comment thread
github-advanced-security[bot] marked this conversation as resolved.
Fixed

/** Path id */
MathLib::bigint path{};
Expand Down
15 changes: 15 additions & 0 deletions test/testnullpointer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3020,6 +3020,21 @@ class TestNullPointer : public TestFixture {
" f(nullptr, nullptr);\n"
"}\n", dinit(CheckOptions, $.inconclusive = true));
ASSERT_EQUALS("", errout_str());

check("struct T {\n" // #14308
" bool b{};\n"
" T* next{};\n"
"};\n"
"bool g(const T*& r) {\n"
" const T* t = r;\n"
" r = t->next;\n"
" return t->b;\n"
"}\n"
"void f(const T* tok) {\n"
" if (g(tok)) {}\n"
" if (tok) {}\n"
"}\n", dinit(CheckOptions, $.inconclusive = true));
ASSERT_EQUALS("", errout_str());
}

// Check if pointer is null and the dereference it
Expand Down
Loading