Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1037,6 +1037,26 @@ transferAssertionResultOperatorBoolCall(const CXXMemberCallExpr *Expr,
State.Env.setValue(*Expr, Res);
}

static void transferDerefCall(const CallExpr *Expr,
const MatchFinder::MatchResult &,
LatticeTransferState &State) {
auto *StatusOrLoc = State.Env.get<RecordStorageLocation>(*Expr->getArg(0));

if (StatusOrLoc && State.Env.getStorageLocation(*Expr) == nullptr)
State.Env.setStorageLocation(*Expr,
StatusOrLoc->getSyntheticField("value"));
}

static void transferArrowCall(const CallExpr *Expr,
const MatchFinder::MatchResult &,
LatticeTransferState &State) {
auto *StatusOrLoc = State.Env.get<RecordStorageLocation>(*Expr->getArg(0));
if (!StatusOrLoc)
return;
State.Env.setValue(*Expr, State.Env.create<PointerValue>(
StatusOrLoc->getSyntheticField("value")));
}

static RecordStorageLocation *
getSmartPtrLikeStorageLocation(const Expr &E, const Environment &Env) {
if (!E.isPRValue())
Expand Down Expand Up @@ -1123,6 +1143,10 @@ buildTransferMatchSwitch(ASTContext &Ctx,
transferValueAssignmentCall)
.CaseOfCFGStmt<CXXConstructExpr>(isStatusOrValueConstructor(),
transferValueConstructor)
.CaseOfCFGStmt<CallExpr>(isStatusOrOperatorCallWithName("->"),
transferArrowCall)
.CaseOfCFGStmt<CallExpr>(isStatusOrOperatorCallWithName("*"),
transferDerefCall)
.CaseOfCFGStmt<CallExpr>(isAsStatusCallWithStatus(),
transferAsStatusCallWithStatus)
.CaseOfCFGStmt<CallExpr>(isAsStatusCallWithStatusOr(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3691,6 +3691,155 @@ TEST_P(UncheckedStatusOrAccessModelTest, UniquePtrReset) {
)cc");
}

TEST_P(UncheckedStatusOrAccessModelTest, NestedStatusOrInStatusOrStruct) {
// Non-standard assignment with a nested StatusOr.
ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Inner {
absl::StatusOr<std::string> sor;
};

struct Outer {
absl::StatusOr<Inner> inner;
};

void target() {
Outer foo = Make<Outer>();
foo.inner->sor = "a"; // [[unsafe]]
}
)cc");

ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Foo {
absl::StatusOr<std::string> sor;
};

void target(const absl::StatusOr<Foo>& foo) {
if (foo.ok() && foo->sor.ok()) foo->sor.value();
}
)cc");

ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Foo {
absl::StatusOr<std::string> sor;
};

void target(const absl::StatusOr<Foo>& foo) {
if (foo.ok() && (*foo).sor.ok()) (*foo).sor.value();
}
)cc");

// With assignment.
ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Foo {
absl::StatusOr<std::string> sor;
};

void target(absl::StatusOr<Foo>& foo) {
if (foo.ok() && foo->sor.ok()) {
foo->sor = Make<absl::StatusOr<std::string>>();
foo->sor.value(); // [[unsafe]]
}
}
)cc");

ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Foo {
absl::StatusOr<std::string> sor;
};

void target(absl::StatusOr<Foo>& foo) {
if (foo.ok() && foo->sor.ok()) {
auto n = Make<absl::StatusOr<std::string>>();
if (n.ok()) foo->sor = n;
foo->sor.value();
}
}
)cc");

ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Foo {
absl::StatusOr<std::string> sor;
};

void target(absl::StatusOr<Foo>& foo) {
if (foo.ok() && foo->sor.ok()) {
auto n = Make<absl::StatusOr<std::string>>();
if (n.ok()) foo->sor = std::move(n);
foo->sor.value();
}
}
)cc");

ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Foo {
absl::StatusOr<std::string> sor;
};

void target(absl::StatusOr<Foo>& foo) {
if (foo.ok() && foo->sor.ok()) *foo->sor;
}
)cc");

ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Foo {
absl::StatusOr<std::string> sor;
};

void target(absl::StatusOr<Foo>& foo) {
if (!foo.ok()) return;
if (!foo->sor.ok())
foo->sor.value(); // [[unsafe]]
else
foo->sor.value();
}
)cc");

ExpectDiagnosticsFor(
R"cc(
#include "unchecked_statusor_access_test_defs.h"

struct Foo {
absl::StatusOr<std::string> sor;
};

void target(absl::StatusOr<Foo>& foo, bool b) {
if (!foo.ok()) return;
if (b) {
if (!foo->sor.ok()) return;
foo->sor.value();
} else {
if (!foo->sor.ok()) return;
foo->sor.value();
}
foo->sor.value();
}
)cc");
}

} // namespace

std::string
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.