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

Clang: Fix removing unsaved file

Browse Source 
We called delete[] on invalid data.

Change-Id: I94147c80119e27b42c280fb527966602fc456f8b
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-08-13 11:48:42 +02:00
parent ef7a7a445b
commit 019e618841
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,6 +30,7 @@
#include "unsavedfiles.h"
#include <algorithm>
#include <cstring>
namespace ClangBackEnd {
@@ -154,12 +155,12 @@ void UnsavedFiles::updateCXUnsavedFileWithFileContainer(const FileContainer &fil
void UnsavedFiles::removeCXUnsavedFile(const FileContainer &fileContainer)
{
const Utf8String filePath = fileContainer.filePath();
auto removeBeginIterator = std::remove_if(d->cxUnsavedFiles.begin(),
auto removeBeginIterator = std::partition(d->cxUnsavedFiles.begin(),
d->cxUnsavedFiles.end(),
[filePath] (const CXUnsavedFile &cxUnsavedFile) { return filePath == cxUnsavedFile.Filename; });
[filePath] (const CXUnsavedFile &cxUnsavedFile) { return filePath != cxUnsavedFile.Filename; });
std::for_each(removeBeginIterator, d->cxUnsavedFiles.end(), UnsavedFiles::deleteCXUnsavedFile);
d->cxUnsavedFiles.erase( removeBeginIterator, d->cxUnsavedFiles.end());
d->cxUnsavedFiles.erase(removeBeginIterator, d->cxUnsavedFiles.end());
}
void UnsavedFiles::addOrUpdateCXUnsavedFile(const FileContainer &fileContainer)
@@ -182,6 +183,4 @@ void UnsavedFiles::updateLastChangeTimePoint()
d->lastChangeTimePoint = std::chrono::steady_clock::now();
}
} // namespace ClangBackEnd