1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memory leak in qSetMessagePattern

Browse Source 
We were leaking memory in case setPattern was called multiple
times

Task-number: QTBUG-43893
Change-Id: Icd9c214edea064aeaeb6f92a9c62836238ccd344
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Kai Koehne 2015-01-26 15:21:12 +01:00 committed by Jani Heikkinen
parent 8e0f56280a
commit 5f6bbce4be
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/global/qlogging.cpp
View File

@ -866,7 +866,7 @@ QMessagePattern::QMessagePattern()
QMessagePattern::~QMessagePattern() QMessagePattern::~QMessagePattern()
{ {
for (int i = 0; literals[i] != 0; ++i) for (int i = 0; literals[i]; ++i)
delete [] literals[i]; delete [] literals[i];
delete [] literals; delete [] literals;
literals = 0; literals = 0;
@ -876,8 +876,12 @@ QMessagePattern::~QMessagePattern()
void QMessagePattern::setPattern(const QString &pattern) void QMessagePattern::setPattern(const QString &pattern)
{ {
if (literals) {
for (int i = 0; literals[i]; ++i)
delete [] literals[i];
delete [] literals;
}
delete [] tokens; delete [] tokens;
delete [] literals;
// scanner // scanner
QList<QString> lexemes; QList<QString> lexemes;