summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-05-02 15:37:33 +0200
committerOlivier Goffart <olivier.goffart@nokia.com>2011-05-10 12:54:54 +0200
commit575410f466799e1c5841db3e1e9624ac20040d6e (patch)
treecda46c39904ad5893b10cc792c5c89f693a06dcb /src
parent0b2f70a5de4e7a71da85dac1626a902259042d60 (diff)
fix potential crash in QProcessEnvironment::systemEnvironment() on windows
GetEnvironmentStrings() can theoretically return null (cherry picked from commit 443608952d7df9a5146317be992320ba232d2cf9)
Diffstat (limited to 'src')
-rw-r--r--src/corelib/io/qprocess_win.cpp21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp
index 7739bbdab9..0c8becc3de 100644
--- a/src/corelib/io/qprocess_win.cpp
+++ b/src/corelib/io/qprocess_win.cpp
@@ -283,18 +283,19 @@ QProcessEnvironment QProcessEnvironment::systemEnvironment()
QProcessEnvironment env;
// Calls to setenv() affect the low-level environment as well.
// This is not the case the other way round.
- wchar_t *envStrings = GetEnvironmentStringsW();
- for (const wchar_t *entry = envStrings; *entry; ) {
- int entryLen = wcslen(entry);
- if (const wchar_t *equal = wcschr(entry, L'=')) {
- int nameLen = equal - entry;
- QString name = QString::fromWCharArray(entry, nameLen);
- QString value = QString::fromWCharArray(equal + 1, entryLen - nameLen - 1);
- env.d->hash.insert(QProcessEnvironmentPrivate::Key(name), value);
+ if (wchar_t *envStrings = GetEnvironmentStringsW()) {
+ for (const wchar_t *entry = envStrings; *entry; ) {
+ int entryLen = wcslen(entry);
+ if (const wchar_t *equal = wcschr(entry, L'=')) {
+ int nameLen = equal - entry;
+ QString name = QString::fromWCharArray(entry, nameLen);
+ QString value = QString::fromWCharArray(equal + 1, entryLen - nameLen - 1);
+ env.d->hash.insert(QProcessEnvironmentPrivate::Key(name), value);
+ }
+ entry += entryLen + 1;
}
- entry += entryLen + 1;
+ FreeEnvironmentStrings(envStrings);
}
- FreeEnvironmentStrings(envStrings);
return env;
}