From 8d3fd88d3f13e0dd7f674df95e2ed6923842c8b4 Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Mon, 10 Jul 2023 15:27:33 +0200 Subject: [PATCH] Fix #11802 FP stlcstr for string in shared_ptr copied elsewhere (#5230) --- lib/checkstl.cpp | 2 +- test/teststl.cpp | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp index ede7460bc..e89eb254d 100644 --- a/lib/checkstl.cpp +++ b/lib/checkstl.cpp @@ -2054,7 +2054,7 @@ void CheckStl::string_c_str() if (Token::Match(refTok, "%var% = %var% .|;|[")) refToNonLocal = !isLocal(refTok->tokAt(2)); } - ptrOrRef = refToNonLocal || (tok2->variable() && tok2->variable()->isPointer()); + ptrOrRef = refToNonLocal || (tok2->variable() && (tok2->variable()->isPointer() || tok2->variable()->isSmartPointer())); } while (tok2) { if (Token::Match(tok2, "%var% .|::")) { diff --git a/test/teststl.cpp b/test/teststl.cpp index 0765d2271..10a33783c 100644 --- a/test/teststl.cpp +++ b/test/teststl.cpp @@ -4261,6 +4261,15 @@ private: " std::string_view sv(s.data(), 13);\n" "}\n"); ASSERT_EQUALS("", errout.str()); + + check("struct S { std::string x; };\n" // #11802 + "std::vector> global;\n" + "const char* f() {\n" + " auto s = std::make_shared();\n" + " global.push_back(s);\n" + " return s->x.c_str();\n" + "}\n"); + ASSERT_EQUALS("", errout.str()); } void uselessCalls() {