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

Fix possible crash in environmentsmodel

Browse Source 
Change-Id: Ib6a3450a7974dc568ba07633a38a29d598a9099f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Tobias Hunger
2011-12-06 15:23:46 +01:00
committed by Eike Ziller
parent a1b2fc95f3
commit 0840b93ff5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/environmentmodel.cpp
View File

@@ -211,7 +211,7 @@ bool EnvironmentModel::setData(const QModelIndex &index, const QVariant &value,
const QString &newName = value.toString(); const QString &newName = value.toString();
#endif #endif
// Does the new name exist already? // Does the new name exist already?
if (d->m_resultEnvironment.hasKey(newName)) if (d->m_resultEnvironment.hasKey(newName) || newName.isEmpty())
return false; return false;
Utils::EnvironmentItem newVariable(newName, oldValue); Utils::EnvironmentItem newVariable(newName, oldValue);
@@ -227,7 +227,7 @@ bool EnvironmentModel::setData(const QModelIndex &index, const QVariant &value,
const QString stringValue = value.toString(); const QString stringValue = value.toString();
if (changesPos != -1) { if (changesPos != -1) {
// We have already changed this value // We have already changed this value
if (stringValue == d->m_baseEnvironment.value(oldName)) { if (d->m_baseEnvironment.hasKey(oldName) && stringValue == d->m_baseEnvironment.value(oldName)) {
// ... and now went back to the base value // ... and now went back to the base value
d->m_items.removeAt(changesPos); d->m_items.removeAt(changesPos);
} else { } else {