Skip to content

Fix another c_strParam regression #4394

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

Merged
danmar merged 15 commits into from
Aug 23, 2022
+8 −5
Merged

Fix another c_strParam regression #4394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b919cd4
Fix #7515 New check: Not needed c_str() operation
chrchr-github Aug 17, 2022
a2ec051
Comment
chrchr-github Aug 18, 2022
fe284ad
Detect more instances of c_str() misuse
chrchr-github Aug 22, 2022
d324df3
Merge
chrchr-github Aug 22, 2022
e64f443
Fix bad merge
chrchr-github Aug 22, 2022
2fed253
Check for data() also
chrchr-github Aug 22, 2022
392310d
Fix
chrchr-github Aug 22, 2022
fb0a403
Format
chrchr-github Aug 22, 2022
3ca4b8b
Format
chrchr-github Aug 22, 2022
f5754cd
Fix c_strParam regression
chrchr-github Aug 23, 2022
16f9d16
Merge
chrchr-github Aug 23, 2022
00a79cc
Fix another c_strParam regression
chrchr-github Aug 23, 2022
41bf806
Merge
chrchr-github Aug 23, 2022
e911e30
Merge
chrchr-github Aug 23, 2022
5b54cfe
Format
chrchr-github Aug 23, 2022
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
4 changes: 2 additions & 2 deletions lib/checkstl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1937,10 +1937,10 @@ void CheckStl::string_c_str()
}

auto isString = [](const Token* str) -> bool {
while (Token::Match(str, "::|."))
str = str->astOperand2();
if (Token::Match(str, "(|[") && !(str->valueType() && str->valueType()->type == ValueType::ITERATOR))
str = str->previous();
else if (Token::simpleMatch(str, "."))
str = str->astOperand2();
return str && ((str->variable() && str->variable()->isStlStringType()) || // variable
(str->function() && isStlStringType(str->function()->retDef)) || // function returning string
(str->valueType() && str->valueType()->type == ValueType::ITERATOR && isStlStringType(str->valueType()->containerTypeToken))); // iterator pointing to string
Expand Down
9 changes: 6 additions & 3 deletions test/teststl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3900,19 +3900,22 @@ class TestStl : public TestFixture {
" std::string a[1];\n"
" struct U { std::string s; } u;"
"};\n"
"namespace N { namespace O { std::string s; } }\n"
"void g(const std::vector<std::string>& v, T& t) {\n"
" for (std::vector<std::string>::const_iterator it = v.begin(); it != v.end(); ++it)\n"
" f(it->c_str());\n"
" f(v.begin()->c_str());\n"
" f(t.g().c_str());\n"
" f(t.a[0].c_str());\n"
" f(t.u.s.c_str());\n"
" f(N::O::s.c_str());\n"
"}\n");
ASSERT_EQUALS("[test.cpp:8]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n"
"[test.cpp:9]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n"
ASSERT_EQUALS("[test.cpp:9]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n"
"[test.cpp:10]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n"
"[test.cpp:11]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n"
"[test.cpp:12]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n",
"[test.cpp:12]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n"
"[test.cpp:13]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n"
"[test.cpp:14]: (performance) Passing the result of c_str() to a function that takes std::string as argument no. 1 is slow and redundant.\n",
errout.str());

check("void svgFile(const std::string &content, const std::string &fileName, const double end = 1000., const double start = 0.);\n"
Expand Down