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

Clang: Reset pointer to null in unsaved files

Browse Source 
Change-Id: I85243b6b041e639fb6313e2fb794a658ca456ea3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Marco Bubke
2015-08-19 12:39:29 +02:00
parent ec4d002857
commit 26cfe2446f
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/clangbackend/ipcsource/unsavedfiles.cpp
View File

@@ -53,7 +53,7 @@ UnsavedFilesData::UnsavedFilesData()
UnsavedFilesData::~UnsavedFilesData() UnsavedFilesData::~UnsavedFilesData()
{ {
for (const CXUnsavedFile &cxUnsavedFile : cxUnsavedFiles) for (CXUnsavedFile &cxUnsavedFile : cxUnsavedFiles)
UnsavedFiles::deleteCXUnsavedFile(cxUnsavedFile); UnsavedFiles::deleteCXUnsavedFile(cxUnsavedFile);
cxUnsavedFiles.clear(); cxUnsavedFiles.clear();
@@ -99,7 +99,7 @@ void UnsavedFiles::remove(const QVector<FileContainer> &fileContainers)
void UnsavedFiles::clear() void UnsavedFiles::clear()
{ {
for (const CXUnsavedFile &cxUnsavedFile : d->cxUnsavedFiles) for (CXUnsavedFile &cxUnsavedFile : d->cxUnsavedFiles)
deleteCXUnsavedFile(cxUnsavedFile); deleteCXUnsavedFile(cxUnsavedFile);
d->cxUnsavedFiles.clear(); d->cxUnsavedFiles.clear();
@@ -137,10 +137,13 @@ CXUnsavedFile UnsavedFiles::createCxUnsavedFile(const Utf8String &filePath, cons
return CXUnsavedFile { cxUnsavedFilePath, cxUnsavedFileContent, ulong(fileContent.byteSize())}; return CXUnsavedFile { cxUnsavedFilePath, cxUnsavedFileContent, ulong(fileContent.byteSize())};
} }
void UnsavedFiles::deleteCXUnsavedFile(const CXUnsavedFile &cxUnsavedFile) void UnsavedFiles::deleteCXUnsavedFile(CXUnsavedFile &cxUnsavedFile)
{ {
delete [] cxUnsavedFile.Contents; delete [] cxUnsavedFile.Contents;
delete [] cxUnsavedFile.Filename; delete [] cxUnsavedFile.Filename;
cxUnsavedFile.Contents = nullptr;
cxUnsavedFile.Filename = nullptr;
cxUnsavedFile.Length = 0;
} }
void UnsavedFiles::updateCXUnsavedFileWithFileContainer(const FileContainer &fileContainer) void UnsavedFiles::updateCXUnsavedFileWithFileContainer(const FileContainer &fileContainer)

2
src/tools/clangbackend/ipcsource/unsavedfiles.h
View File

@@ -73,7 +73,7 @@ public:
private: private:
CXUnsavedFile createCxUnsavedFile(const Utf8String &filePath, const Utf8String &fileContent); CXUnsavedFile createCxUnsavedFile(const Utf8String &filePath, const Utf8String &fileContent);
static void deleteCXUnsavedFile(const CXUnsavedFile &cxUnsavedFile); static void deleteCXUnsavedFile(CXUnsavedFile &cxUnsavedFile);
void updateCXUnsavedFileWithFileContainer(const FileContainer &fileContainer); void updateCXUnsavedFileWithFileContainer(const FileContainer &fileContainer);
void removeCXUnsavedFile(const FileContainer &fileContainer); void removeCXUnsavedFile(const FileContainer &fileContainer);
void addOrUpdateCXUnsavedFile(const FileContainer &fileContainer); void addOrUpdateCXUnsavedFile(const FileContainer &fileContainer);