feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Refactor: Comment out delete statement of heap variables

Browse Source 
Convert to Stack Variable generates crashing code.

Task-number: QTCREATORBUG-13685
Change-Id: I4555de223e50bc8d75e97205d273aa0f09f652fc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Libor Tomsik
2015-02-26 13:59:23 +01:00
parent 07e9c44171
commit 0038e82782
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/cppeditor/cppquickfix_test.cpp
View File

@@ -1471,6 +1471,23 @@ void CppEditorPlugin::test_quickfix_data()
" str.clear();\n" " str.clear();\n"
"}\n"); "}\n");
QTest::newRow("ConvertFromPointer_structWithPointer")
<< CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
<< _("struct Bar{ QString *str; };\n"
"void foo() {\n"
" Bar *@bar = new Bar;\n"
" bar->str = new QString;\n"
" delete bar->str;\n"
" delete bar;\n"
"}\n")
<< _("struct Bar{ QString *str; };\n"
"void foo() {\n"
" Bar bar;\n"
" bar.str = new QString;\n"
" delete bar.str;\n"
" // delete bar;\n"
"}\n");
QTest::newRow("ConvertToPointer_withInitializer") QTest::newRow("ConvertToPointer_withInitializer")
<< CppQuickFixFactoryPtr(new ConvertFromAndToPointer) << CppQuickFixFactoryPtr(new ConvertFromAndToPointer)
<< _("void foo() {\n" << _("void foo() {\n"

9
src/plugins/cppeditor/cppquickfixes.cpp
View File

@@ -4077,6 +4077,8 @@ private:
bool starFound = false; bool starFound = false;
int ampersandPos = 0; int ampersandPos = 0;
bool memberAccess = false; bool memberAccess = false;
bool deleteCall = false;
for (int i = path.count() - 2; i >= 0; --i) { for (int i = path.count() - 2; i >= 0; --i) {
if (path.at(i) == m_declaratorAST) { if (path.at(i) == m_declaratorAST) {
declarationFound = true; declarationFound = true;
@@ -4089,6 +4091,11 @@ private:
changes.replace(pos, pos + 2, QLatin1String(".")); changes.replace(pos, pos + 2, QLatin1String("."));
memberAccess = true; memberAccess = true;
break; break;
} else if (DeleteExpressionAST *deleteAST = path.at(i)->asDeleteExpression()) {
const int pos = m_file->startOf(deleteAST->delete_token);
changes.insert(pos, QLatin1String("// "));
deleteCall = true;
break;
} else if (UnaryExpressionAST *unaryExprAST = path.at(i)->asUnaryExpression()) { } else if (UnaryExpressionAST *unaryExprAST = path.at(i)->asUnaryExpression()) {
const Token tk = m_file->tokenAt(unaryExprAST->unary_op_token); const Token tk = m_file->tokenAt(unaryExprAST->unary_op_token);
if (tk.kind() == T_STAR) { if (tk.kind() == T_STAR) {
@@ -4110,7 +4117,7 @@ private:
break; break;
} }
} }
if (!declarationFound && !starFound && !memberAccess) { if (!declarationFound && !starFound && !memberAccess && !deleteCall) {
if (ampersandPos) { if (ampersandPos) {
changes.insert(ampersandPos, QLatin1String("&(")); changes.insert(ampersandPos, QLatin1String("&("));
changes.insert(m_file->endOf(idAST->firstToken()), QLatin1String(")")); changes.insert(m_file->endOf(idAST->firstToken()), QLatin1String(")"));