author | zautrix <zautrix> | 2004-07-03 23:59:49 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-07-03 23:59:49 (UTC) |
commit | 22470ff7ffe034a94bedb52b517ee4d245ae2808 (patch) (side-by-side diff) | |
tree | 44cbe6a45c6ebb6c5dd64fa035cd995ee3b4d463 | |
parent | 260befadfaa64d94de7d38d7f6cad0d22f52c226 (diff) | |
download | kdepimpi-22470ff7ffe034a94bedb52b517ee4d245ae2808.zip kdepimpi-22470ff7ffe034a94bedb52b517ee4d245ae2808.tar.gz kdepimpi-22470ff7ffe034a94bedb52b517ee4d245ae2808.tar.bz2 |
Fixed memory access violation in distlist handling
-rw-r--r-- | microkde/kconfig.cpp | 42 |
1 files changed, 40 insertions, 2 deletions
diff --git a/microkde/kconfig.cpp b/microkde/kconfig.cpp index 3f23ed2..b882adb 100644 --- a/microkde/kconfig.cpp +++ b/microkde/kconfig.cpp @@ -338,6 +338,18 @@ bool KConfig::deleteGroup( const QString& group) int pos; QMap<QString,bool>::Iterator itBool; + QMap<QString,bool>::Iterator delBool; + while ( itBool != mBoolMap.end() ) { + pos = itBool.key().find( group ); + if (pos == 0) { + delBool = itBool; + ++itBool; + mBoolMap.remove(delBool); + dirty = true; + } + + } + /* for( itBool = mBoolMap.begin(); itBool != mBoolMap.end(); ++itBool ) { pos = itBool.key().find( group ); @@ -346,8 +358,21 @@ bool KConfig::deleteGroup( const QString& group) dirty = true; } } + */ + QMap<QString,QString>::Iterator itString = mStringMap.begin(); + QMap<QString,QString>::Iterator delString ; + while( itString != mStringMap.end() ) { + pos = itString.key().find( group ); + if (pos == 0) { + delString = itString; + ++itString; + mStringMap.remove(delString); + //qDebug("delte++++++++++++++++++ "); + dirty = true; + } - QMap<QString,QString>::Iterator itString; + } + /* this leads to a memory access violation for( itString = mStringMap.begin(); itString != mStringMap.end(); ++itString ) { pos = itString.key().find( group ); @@ -356,8 +381,20 @@ bool KConfig::deleteGroup( const QString& group) dirty = true; } } + */ + QMap<QString,QDateTime>::Iterator itDateTime= mDateTimeMap.begin(); + QMap<QString,QDateTime>::Iterator delDateTime; + while ( itDateTime != mDateTimeMap.end() ) { + pos = itDateTime.key().find( group ); + if (pos == 0) { + delDateTime = itDateTime; + ++itDateTime; + mDateTimeMap.remove(delDateTime); + dirty = true; + } - QMap<QString,QDateTime>::Iterator itDateTime; + } + /* for( itDateTime = mDateTimeMap.begin(); itDateTime != mDateTimeMap.end(); ++itDateTime ) { pos = itDateTime.key().find( group ); @@ -366,6 +403,7 @@ bool KConfig::deleteGroup( const QString& group) dirty = true; } } + */ if (dirty) mDirty = true; |