diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2013-02-08 11:32:14 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-08 17:31:47 (GMT) |
| commit | 3ad159d54cfe70e50cd7788f9774ea8c378bfcaa (patch) | |
| tree | 9cab056ba112420b9bae853a4214b753c94993b0 /src | |
| parent | afb216fb47cc3a828513bcf7d279a8d865f44741 (diff) | |
| download | Qt-3ad159d54cfe70e50cd7788f9774ea8c378bfcaa.zip Qt-3ad159d54cfe70e50cd7788f9774ea8c378bfcaa.tar.gz Qt-3ad159d54cfe70e50cd7788f9774ea8c378bfcaa.tar.bz2 | |
QProcessEnvironment: Permit magic cmd variables
The cmd shell inserts magic variables starting with a = into the
environment.
Task-number: QTCREATORBUG-8716
Change-Id: I2f140032aea4fb1d77633c6baf90d7b536e2812a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/e7a242b27b961c64613542c75c69954d1c7bd315)
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/qprocess_win.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp index f780971..6cf6d65 100644 --- a/src/corelib/io/qprocess_win.cpp +++ b/src/corelib/io/qprocess_win.cpp @@ -283,7 +283,8 @@ QProcessEnvironment QProcessEnvironment::systemEnvironment() if (wchar_t *envStrings = GetEnvironmentStringsW()) { for (const wchar_t *entry = envStrings; *entry; ) { int entryLen = wcslen(entry); - if (const wchar_t *equal = wcschr(entry, L'=')) { + // + 1 to permit magic cmd variable names starting with = + if (const wchar_t *equal = wcschr(entry + 1, L'=')) { int nameLen = equal - entry; QString name = QString::fromWCharArray(entry, nameLen); QString value = QString::fromWCharArray(equal + 1, entryLen - nameLen - 1); |