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

CppTools: Prevent SegFault in the ClangFormatIndenter

Browse Source 
If you create a ClangFormatIndenter but do not set the
fileName, the indenter will SegFault while indenting.

Change-Id: I93a56d7916bc1a02da9ee21a116bd48b4405edb1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Leander Schulten
2020-07-20 21:17:52 +02:00
parent 200d81d38c
commit 755659e663
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/cpptools/cpprefactoringchanges.cpp
View File

@@ -47,11 +47,14 @@ namespace CppTools {
class CppRefactoringChangesData : public TextEditor::RefactoringChangesData class CppRefactoringChangesData : public TextEditor::RefactoringChangesData
{ {
static std::unique_ptr<TextEditor::Indenter> createIndenter(QTextDocument *textDocument) static std::unique_ptr<TextEditor::Indenter> createIndenter(const QString &fileName,
QTextDocument *textDocument)
{ {
TextEditor::ICodeStylePreferencesFactory *factory TextEditor::ICodeStylePreferencesFactory *factory
= TextEditor::TextEditorSettings::codeStyleFactory(CppTools::Constants::CPP_SETTINGS_ID); = TextEditor::TextEditorSettings::codeStyleFactory(CppTools::Constants::CPP_SETTINGS_ID);
return std::unique_ptr<TextEditor::Indenter>(factory->createIndenter(textDocument)); std::unique_ptr<TextEditor::Indenter> indenter(factory->createIndenter(textDocument));
indenter->setFileName(Utils::FilePath::fromString(fileName));
return indenter;
} }
public: public:
@@ -69,7 +72,7 @@ public:
textDocument->indenter()->indent(selection, QChar::Null, textDocument->tabSettings()); textDocument->indenter()->indent(selection, QChar::Null, textDocument->tabSettings());
} else { } else {
const auto &tabSettings = ProjectExplorer::actualTabSettings(fileName, textDocument); const auto &tabSettings = ProjectExplorer::actualTabSettings(fileName, textDocument);
auto indenter = createIndenter(selection.document()); auto indenter = createIndenter(fileName, selection.document());
indenter->indent(selection, QChar::Null, tabSettings); indenter->indent(selection, QChar::Null, tabSettings);
} }
} }
@@ -82,7 +85,7 @@ public:
textDocument->indenter()->reindent(selection, textDocument->tabSettings()); textDocument->indenter()->reindent(selection, textDocument->tabSettings());
} else { } else {
const auto &tabSettings = ProjectExplorer::actualTabSettings(fileName, textDocument); const auto &tabSettings = ProjectExplorer::actualTabSettings(fileName, textDocument);
auto indenter = createIndenter(selection.document()); auto indenter = createIndenter(fileName, selection.document());
indenter->reindent(selection, tabSettings); indenter->reindent(selection, tabSettings);
} }
} }