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

Environment: Do not allow keys containing '='

Browse Source 
Those keys will cause trouble later, so do not allow them.

Change-Id: Ib2f51a469253d9df21c6a77faa47e6e88feadc07
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2018-09-04 11:57:14 +02:00
parent 50c808b1ef
commit bfc76b4cd8
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/environment.cpp
View File

@@ -238,8 +238,10 @@ Environment::Environment(const QStringList &env, OsType osType) : m_osType(osTyp
int i = s.indexOf('=', 1);
if (i >= 0) {
const QString key = s.left(i);
const QString value = s.mid(i + 1);
set(key, value);
if (!key.contains('=')) {
const QString value = s.mid(i + 1);
set(key, value);
}
}
}
}
@@ -262,6 +264,7 @@ QProcessEnvironment Environment::toProcessEnvironment() const
void Environment::set(const QString &key, const QString &value)
{
QTC_ASSERT(!key.contains('='), return);
auto it = findKey(m_values, m_osType, key);
if (it == m_values.end())
m_values.insert(key, value);
@@ -271,6 +274,7 @@ void Environment::set(const QString &key, const QString &value)
void Environment::unset(const QString &key)
{
QTC_ASSERT(!key.contains('='), return);
auto it = findKey(m_values, m_osType, key);
if (it != m_values.end())
m_values.erase(it);
@@ -278,6 +282,7 @@ void Environment::unset(const QString &key)
void Environment::appendOrSet(const QString &key, const QString &value, const QString &sep)
{
QTC_ASSERT(!key.contains('='), return);
auto it = findKey(m_values, m_osType, key);
if (it == m_values.end()) {
m_values.insert(key, value);
@@ -291,6 +296,7 @@ void Environment::appendOrSet(const QString &key, const QString &value, const QS
void Environment::prependOrSet(const QString&key, const QString &value, const QString &sep)
{
QTC_ASSERT(!key.contains('='), return);
auto it = findKey(m_values, m_osType, key);
if (it == m_values.end()) {
m_values.insert(key, value);